From 8dd2be10fd7835a6cd4c02d7d8430d4e347d6b99 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Sun, 8 Jan 2012 22:24:54 +0000 Subject: cleaning of the amavis module --- modules/amavis/manifests/init.pp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'modules') 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') } -- cgit v1.2.1