From aa413db2a07ab6143b2f5bdc1c6ab734d16c97e8 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Thu, 7 May 2009 07:59:47 +0100 Subject: [PATCH] New template for all. Signed-off-by: Stephen Gran --- modules/exim/manifests/init.pp | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp index a1d47c02..4d503f1a 100644 --- a/modules/exim/manifests/init.pp +++ b/modules/exim/manifests/init.pp @@ -2,27 +2,6 @@ class exim { package { exim4-daemon-heavy: ensure => installed } - case $hostname { - handel, kassia, piatti, spohr, ancina, allegri, powell: { - file { - "/etc/exim4/exim4.conf": - content => template("exim/eximconf.erb"), - require => Package["exim4-daemon-heavy"], - notify => Exec["exim4 reload"] - ; - } - } - default: { - file { - "/etc/exim4/exim4.conf": - source => [ "puppet:///exim/per-host/$fqdn/exim4.conf", - "puppet:///exim/common/exim4.conf" ], - require => Package["exim4-daemon-heavy"], - notify => Exec["exim4 reload"] - ; - } - } - } file { "/etc/exim4/": ensure => directory, @@ -38,6 +17,11 @@ class exim { mode => 750, purge => true ; + "/etc/exim4/exim4.conf": + content => template("exim/eximconf.erb"), + require => Package["exim4-daemon-heavy"], + notify => Exec["exim4 reload"] + ; "/etc/exim4/manualroute": require => Package["exim4-daemon-heavy"], source => [ "puppet:///exim/per-host/$fqdn/manualroute", -- 2.39.2