Bug 1313958 - Provide clamav >= v0.98 in our yum repos; r?nthomas
MozReview-Commit-ID: Gi56iMfegji
--- a/modules/packages/manifests/clamd.pp
+++ b/modules/packages/manifests/clamd.pp
@@ -1,18 +1,19 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
class packages::clamd {
case $::operatingsystem {
CentOS: {
+ realize(Packages::Yumrepo['clamav'])
package {
"clamd":
- ensure => latest;
+ ensure => '0.99.2-1.el6';
}
}
default: {
fail("cannot install on $::operatingsystem")
}
}
}
--- a/modules/packages/manifests/setup.pp
+++ b/modules/packages/manifests/setup.pp
@@ -109,21 +109,24 @@ class packages::setup {
"mozilla-mercurial":
url_path => "repos/yum/custom/mozilla-mercurial/$architecture";
"python35":
url_path => "repos/yum/custom/mozilla-python35/$architecture";
"python27-12":
url_path => "repos/yum/custom/mozilla-python2712/$architecture";
+
+ "clamav":
+ url_path => "repos/yum/custom/clamav/$architecture";
}
# to flush the metadata cache, increase this value by one (or
# anything, really, just change it).
- $repoflag = 48
+ $repoflag = 49
file {
"/etc/.repo-flag":
content =>
"# see \$repoflag in modules/packages/manifests/setup.pp\n$repoflag\n",
notify => Exec['yum-clean-expire-cache'];
}
exec {
yum-clean-expire-cache: