Fixing service definitions at mail::amavisd

diff --git a/manifests/amavisd.pp b/manifests/amavisd.pp
index 75b4b1c72d6a88e471c9b67dd9c5b8b914bf7d4a..4bf17f7c9eebf5d043d3a05d674d218e9d7563e9 100644 (file)
--- a/manifests/amavisd.pp
+++ b/manifests/amavisd.pp
@@ -1,14 +1,10 @@
 class mail::amavisd {
-  service { "amavisd":
+  service { "amavis":
     ensure  => running,
+    pattern => 'amavisd',
     require => [ Package['amavisd-new'], Service['clamav-daemon', 'spamassassin'] ],
   }
 
-  service { "freshclam":
-    ensure  => running,
-    require => Package['clamav-freshclam'],
-  }
-
   file { "/etc/amavis/conf.d/05-domain_id":
     ensure => present,
     owner  => root,