From d6b521372243b79105a1513d4559572dfab6db54 Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
Date: Tue, 22 Sep 2015 15:04:33 -0400
Subject: add clamav filtering, with sanesecurity signature updating and
 provider whitelisting (#3625)

Change-Id: I15985ca00ee95bc62855f098a78e364ebbc32616
---
 puppet/modules/clamav/manifests/milter.pp | 48 +++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 puppet/modules/clamav/manifests/milter.pp

(limited to 'puppet/modules/clamav/manifests/milter.pp')

diff --git a/puppet/modules/clamav/manifests/milter.pp b/puppet/modules/clamav/manifests/milter.pp
new file mode 100644
index 00000000..52ddaef1
--- /dev/null
+++ b/puppet/modules/clamav/manifests/milter.pp
@@ -0,0 +1,48 @@
+class clamav::milter {
+
+  $clamav                = hiera('clamav')
+  $whitelisted_addresses = $clamav['whitelisted_addresses']
+  $domain_hash           = hiera('domain')
+  $domain                = $domain_hash['full_suffix']
+
+  package { 'clamav-milter': ensure => installed }
+
+  service {
+    'clamav-milter':
+      ensure     => running,
+      enable     => true,
+      name       => clamav-milter,
+      pattern    => '/usr/sbin/clamav-milter',
+      hasrestart => true,
+      subscribe  => File['/etc/default/clamav-milter'];
+  }
+
+  file {
+    '/run/clamav/milter.ctl':
+      mode    => '0666',
+      owner   => clamav,
+      group   => postfix,
+      require => Class['clamav::daemon'];
+
+    '/etc/clamav/clamav-milter.conf':
+      content   => template('clamav/clamav-milter.conf.erb'),
+      mode      => '0644',
+      owner     => root,
+      group     => root,
+      subscribe => Service['clamav-milter'];
+
+    '/etc/default/clamav-milter':
+      source => 'puppet:///modules/clamav/clamav-milter_default',
+      mode   => '0644',
+      owner  => root,
+      group  => root;
+
+    '/etc/clamav/whitelisted_addresses':
+      content => template('clamav/whitelisted_addresses.erb'),
+      mode    => '0644',
+      owner   => root,
+      group   => root;
+
+  }
+
+}
-- 
cgit v1.2.3


From 43595b105a21aaccb41c4d9199d87b3dc2d48ab5 Mon Sep 17 00:00:00 2001
From: Micah <micah@leap.se>
Date: Tue, 13 Oct 2015 15:58:12 -0400
Subject: Fix ordering of clamav resources, by requiring the package
 installation as a pre-requisite

Change-Id: Ic9c8cc6ccfb31ce5e56937a2d95de7974707c368
---
 puppet/modules/clamav/manifests/milter.pp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/clamav/manifests/milter.pp')

diff --git a/puppet/modules/clamav/manifests/milter.pp b/puppet/modules/clamav/manifests/milter.pp
index 52ddaef1..e8a85e3f 100644
--- a/puppet/modules/clamav/manifests/milter.pp
+++ b/puppet/modules/clamav/manifests/milter.pp
@@ -14,6 +14,7 @@ class clamav::milter {
       name       => clamav-milter,
       pattern    => '/usr/sbin/clamav-milter',
       hasrestart => true,
+      require    => Package['clamav-milter'],
       subscribe  => File['/etc/default/clamav-milter'];
   }
 
@@ -29,6 +30,7 @@ class clamav::milter {
       mode      => '0644',
       owner     => root,
       group     => root,
+      require   => Package['clamav-milter'],
       subscribe => Service['clamav-milter'];
 
     '/etc/default/clamav-milter':
@@ -41,8 +43,8 @@ class clamav::milter {
       content => template('clamav/whitelisted_addresses.erb'),
       mode    => '0644',
       owner   => root,
-      group   => root;
-
+      group   => root,
+      require => Package['clamav-milter'];
   }
 
 }
-- 
cgit v1.2.3