Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...

[dsa-puppet.git] / modules / exim / manifests / init.pp

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 0b1af4b8d35a108628684bd79807f42ece17dfbd..a8868507ddc4670d4431d1c2ad037a7eea719e26 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -18,10 +18,14 @@ class exim {
           purge   => true
         ;
         "/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" ]
           ;
         "/etc/exim4/blacklist":
           require => Package["exim4-daemon-heavy"],
@@ -45,8 +49,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"],
@@ -70,8 +73,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"],
@@ -88,9 +90,16 @@ 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":
           require => Package["exim4-daemon-heavy"],
@@ -127,8 +136,3 @@ class exim {
         refreshonly => true,
     }
 }
-
-class eximmx inherits exim {
-    include clamav
-    include postgrey
-}