massive style guide fixups

[dsa-puppet.git] / modules / clamav / manifests / init.pp

diff --git a/modules/clamav/manifests/init.pp b/modules/clamav/manifests/init.pp
index f32805d98b94724c4059291a19c5aeff0a902ba6..47c4109d7d2d6491af236913876338fbdf16a707 100644 (file)
--- a/modules/clamav/manifests/init.pp
+++ b/modules/clamav/manifests/init.pp
@@ -1,30 +1,22 @@
 class clamav {
-    package { "clamav-daemon": ensure => installed;
-              "clamav-freshclam": ensure => installed;
-    }
+       package { [
+                       'clamav-daemon',
+                       'clamav-freshclam',
+                       'clamav-unofficial-sigs'
+               ]:
+                       ensure => installed
+       }
 
-    file {
-        "/etc/clamav/clamd.conf":
-          source  => "puppet:///clamav/clamd.conf",
-          require => Package["clamav-daemon"],
-          notify  => Exec["clamav-daemon restart"]
-          ;
-    }
+       file { '/var/lib/clamav/mbl.ndb':
+               ensure  => absent
+       }
+       file { '/etc/clamav-unofficial-sigs.dsa.conf':
+               require => Package['clamav-unofficial-sigs'],
+               source  => [ 'puppet:///modules/clamav/clamav-unofficial-sigs.dsa.conf' ]
+       }
+       file { '/etc/clamav-unofficial-sigs.conf':
+               require => Package['clamav-unofficial-sigs'],
+               source  => [ 'puppet:///modules/clamav/clamav-unofficial-sigs.conf' ]
+       }
 
-    file {
-        "/etc/clamav/freshclam.conf":
-          source  => "puppet:///clamav/freshclam.conf",
-          require => Package["clamav-freshclam"],
-          notify  => Exec["clamav-freshclam restart"]
-          ;
-    }
-    exec { "clamav-daemon restart":
-        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-        refreshonly => true,
-    }
-    exec { "clamav-freshclam restart":
-        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-        refreshonly => true,
-    }
 }
-