X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=43dd108df4f6e3302d144f333cb01129a1d5d6f4;hb=fcbf04aea39b64665b78d2e48b7a38b5f6579514;hp=a1d47c0214754b23706361d1126ebed544daa077;hpb=dac3b98b327149bf1458d77bec32a77ce4facc2c;p=dsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index a1d47c02..43dd108d 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, kassia, piatti, spohr, ancina, allegri, powell: {
-             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,
@@ -31,17 +19,44 @@ class exim {
           mode    => 755,
           purge   => true
         ;
+        "/etc/exim4/Git":
+          ensure  => directory,
+          purge   => true,
+          force   => true,
+          recurse => true,
+          source  => "puppet:///files/empty/"
+        ;
+        "/etc/exim4/conf.d":
+          ensure  => directory,
+          purge   => true,
+          force   => true,
+          recurse => true,
+          source  => "puppet:///files/empty/"
+        ;
         "/etc/exim4/ssl":
           ensure  => directory,
           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"],
+          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"],
@@ -77,11 +92,6 @@ class exim {
           source  => [ "puppet:///exim/per-host/$fqdn/rbllist",
                        "puppet:///exim/common/rbllist" ]
           ;
-        "/etc/exim4/rcpthosts":
-          require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/rcpthosts",
-                       "puppet:///exim/common/rcpthosts" ]
-          ;
         "/etc/exim4/rhsbllist":
           require => Package["exim4-daemon-heavy"],
           source  => [ "puppet:///exim/per-host/$fqdn/rhsbllist",
@@ -106,17 +116,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"),
-          notify  => Exec["exim4 reload"]
-          ;
         "/etc/exim4/ssl/thishost.crt":
           require => Package["exim4-daemon-heavy"],
           source  => "puppet:///exim/certs/$fqdn.crt",
@@ -145,6 +144,12 @@ class exim {
           group   => Debian-exim,
           mode    => 640
           ;
+        "/var/log/exim4":
+          mode    => 2750,
+          ensure  => directory,
+          owner   => Debian-exim,
+          group   => maillog
+          ;
     }
 
     exec { "exim4 reload":
@@ -152,8 +157,3 @@ class exim {
         refreshonly => true,
     }
 }
-
-class eximmx inherits exim {
-    include clamav
-    include postgrey
-}