X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=80f44d88c5fbf0ce775e538a238e1e9fb2437a8a;hb=f26d701aaead086614b9d335e1b9ade03d5ea807;hp=110af6b2a194a3add238903d159950d7d0d61809;hpb=55aa63e1ea1b8425b75ad18fb9ea07b3c27f3f5d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 110af6b2a..80f44d88c 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,
@@ -50,8 +71,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 +95,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"],
@@ -93,9 +112,15 @@ class exim {
           source  => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-paniclog",
                        "puppet:///exim/common/logrotate-exim4-paniclog" ]
           ;
+        "/etc/exim4/local-settings.conf":
+          require => Package["exim4-daemon-heavy"],
+          source  => [ "puppet:///exim/per-host/$fqdn/local-settings.conf",
+                       "puppet:///exim/common/local-settings.conf" ],
+          notify  => Exec["exim4 reload"]
+          ;
         "/etc/exim4/local-auto.conf":
           require => Package["exim4-daemon-heavy"],
-          content => template("exim-local-auto.erb")
+          content => template("exim-local-auto.erb"),
           notify  => Exec["exim4 reload"]
           ;
         "/etc/exim4/ssl/thishost.crt":