X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=a8868507ddc4670d4431d1c2ad037a7eea719e26;hb=49fbaee9b384e149d252323ca150d42c7c6a8d3e;hp=48f4621513ad3ee1926c6542fd53ad5e90c9fdce;hpb=e625085698b79d6701d9a7f452c7804467200e6b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 48f462151..a8868507d 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: {
-             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",
@@ -152,8 +136,3 @@ class exim {
         refreshonly => true,
     }
 }
-
-class eximmx inherits exim {
-    include clamav
-    include postgrey
-}