X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=b2c1e71faba525339422400fa5c6ba074248b4ba;hb=85e69a1445c82de137d48da44ed9f30ab643d209;hp=3ad6a6e0651003ee0826ce5c1db024c96810e0c4;hpb=147f608922d575f871c86b1fe4a62787fcda3bc0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 3ad6a6e06..b2c1e71fa 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -2,6 +2,27 @@ class exim {
 
     package { exim4-daemon-heavy: ensure => installed }
 
+    case $hostname {
+         handel: {
+             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,
@@ -17,12 +38,6 @@ class exim {
           mode    => 750,
           purge   => true
         ;
-        "/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"]
-          ;
         "/etc/exim4/manualroute":
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/manualroute",
@@ -50,8 +65,7 @@ class exim {
           ;
         "/etc/exim4/locals":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/locals",
-                       "puppet:///exim/common/locals" ]
+          content => template("exim/locals.erb")
           ;
         "/etc/exim4/localusers":
           require => Package["exim4-daemon-heavy"],
@@ -75,8 +89,7 @@ class exim {
           ;
         "/etc/exim4/virtualdomains":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/virtualdomains",
-                       "puppet:///exim/common/virtualdomains" ]
+          content => template("exim/virtualdomains.erb")
           ;
         "/etc/exim4/whitelist":
           require => Package["exim4-daemon-heavy"],