X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=0b5f7d6757f7a1de1a3400fac0e188bd528ee382;hb=77b092ac8ea179f08fa7cb3799c76753d52f8af0;hp=3b51141aafd24ce5371bf62adef8b234eed07f84;hpb=ccb562b90a4c08026f7e8afde7d9ea6e3d6382e3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 3b51141aa..0b5f7d675 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,4 +1,13 @@
 class exim {
+    activate_munin_check {
+            "ps_exim4": script => "ps_";
+            "exim_mailqueue":;
+            "exim_mailstats":;
+            "postfix_mailqueue":  ensure => absent;
+            "postfix_mailstats":  ensure => absent;
+            "postfix_mailvolume": ensure => absent;
+    }
+
 
     package { exim4-daemon-heavy: ensure => installed }
 
@@ -15,8 +24,12 @@ class exim {
           owner   => root,
           group   => Debian-exim,
           mode    => 750,
+          require => Package["exim4-daemon-heavy"],
           purge   => true
         ;
+        "/etc/mailname":
+          content => template("exim/mailname.erb"),
+        ;
         "/etc/exim4/exim4.conf":
           content => template("exim/eximconf.erb"),
           require => Package["exim4-daemon-heavy"],
@@ -24,8 +37,7 @@ class exim {
         ;
         "/etc/exim4/manualroute":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/manualroute",
-                       "puppet:///exim/common/manualroute" ]
+          content => template("exim/manualroute.erb")
           ;
         "/etc/exim4/host_blacklist":
           require => Package["exim4-daemon-heavy"],
@@ -95,12 +107,6 @@ 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"),