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

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 80f44d88c..0b5f7d675 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,28 +1,16 @@
 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 }
 
-    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,
@@ -36,18 +24,25 @@ 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":
-          source  => [ "puppet:///exim/per-host/$fqdn/exim4.conf",
-                       "puppet:///exim/common/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",
-                       "puppet:///exim/common/manualroute" ]
+          content => template("exim/manualroute.erb")
+          ;
+        "/etc/exim4/host_blacklist":
+          require => Package["exim4-daemon-heavy"],
+          source  => [ "puppet:///exim/per-host/$fqdn/host_blacklist",
+                       "puppet:///exim/common/host_blacklist" ]
           ;
         "/etc/exim4/blacklist":
           require => Package["exim4-daemon-heavy"],
@@ -112,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"),
@@ -158,8 +147,3 @@ class exim {
         refreshonly => true,
     }
 }
-
-class eximmx inherits exim {
-    include clamav
-    include postgrey
-}