New template for all.

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index a1d47c0214754b23706361d1126ebed544daa077..4d503f1ab8a691b7d944aa1ff35d5926578fab41 100644 (file)
--- 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",