aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/amavis/manifests/init.pp12
1 files changed, 2 insertions, 10 deletions
diff --git a/modules/amavis/manifests/init.pp b/modules/amavis/manifests/init.pp
index 9afcd51a..631e2b33 100644
--- a/modules/amavis/manifests/init.pp
+++ b/modules/amavis/manifests/init.pp
@@ -1,8 +1,5 @@
class amavis {
-
- package { "amavisd-new":
- ensure => installed,
- }
+ package { "amavisd-new": }
service { "amavisd":
ensure => running,
@@ -10,12 +7,7 @@ class amavis {
subscribe => [Package["amavisd-new"], File["amavisd.conf"]],
}
- file { "amavisd.conf":
- path => "/etc/amavisd/amavisd.conf",
- ensure => present,
- owner => root,
- group => root,
- mode => 644,
+ file { "/etc/amavisd/amavisd.conf":
require => Package["amavisd-new"],
content => template('amavis/amavisd.conf')
}