diff options
| author | Michael Scherer <misc@mageia.org> | 2012-01-08 22:24:54 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-01-08 22:24:54 +0000 |
| commit | 8dd2be10fd7835a6cd4c02d7d8430d4e347d6b99 (patch) | |
| tree | de7f9b6b58566a288d8f9db9ab4355d919ea5868 | |
| parent | 490ea98d094260d3fc47e0e9a322891f503224ab (diff) | |
| download | puppet-8dd2be10fd7835a6cd4c02d7d8430d4e347d6b99.tar puppet-8dd2be10fd7835a6cd4c02d7d8430d4e347d6b99.tar.gz puppet-8dd2be10fd7835a6cd4c02d7d8430d4e347d6b99.tar.bz2 puppet-8dd2be10fd7835a6cd4c02d7d8430d4e347d6b99.tar.xz puppet-8dd2be10fd7835a6cd4c02d7d8430d4e347d6b99.zip | |
cleaning of the amavis module
| -rw-r--r-- | modules/amavis/manifests/init.pp | 12 |
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') } |