Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

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

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 50484f9086f7be81a23d1a2dce62e311e34971da..5bf93feebfca44845cb170bf3d2f135e3b260d2b 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -55,28 +55,28 @@ class exim {
           ;
         "/etc/exim4/host_blacklist":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/host_blacklist",
-                       "puppet:///exim/common/host_blacklist" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/host_blacklist",
+                       "puppet:///modules/exim/common/host_blacklist" ]
           ;
         "/etc/exim4/blacklist":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/blacklist",
-                       "puppet:///exim/common/blacklist" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/blacklist",
+                       "puppet:///modules/exim/common/blacklist" ]
           ;
         "/etc/exim4/callout_users":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/callout_users",
-                       "puppet:///exim/common/callout_users" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/callout_users",
+                       "puppet:///modules/exim/common/callout_users" ]
           ;
         "/etc/exim4/grey_users":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/grey_users",
-                       "puppet:///exim/common/grey_users" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/grey_users",
+                       "puppet:///modules/exim/common/grey_users" ]
           ;
         "/etc/exim4/helo-check":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/helo-check",
-                       "puppet:///exim/common/helo-check" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/helo-check",
+                       "puppet:///modules/exim/common/helo-check" ]
           ;
         "/etc/exim4/locals":
           require => Package["exim4-daemon-heavy"],
@@ -84,18 +84,18 @@ class exim {
           ;
         "/etc/exim4/localusers":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/localusers",
-                       "puppet:///exim/common/localusers" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/localusers",
+                       "puppet:///modules/exim/common/localusers" ]
           ;
         "/etc/exim4/rbllist":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/rbllist",
-                       "puppet:///exim/common/rbllist" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/rbllist",
+                       "puppet:///modules/exim/common/rbllist" ]
           ;
         "/etc/exim4/rhsbllist":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/rhsbllist",
-                       "puppet:///exim/common/rhsbllist" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/rhsbllist",
+                       "puppet:///modules/exim/common/rhsbllist" ]
           ;
         "/etc/exim4/virtualdomains":
           require => Package["exim4-daemon-heavy"],
@@ -103,43 +103,48 @@ class exim {
           ;
         "/etc/exim4/whitelist":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/whitelist",
-                       "puppet:///exim/common/whitelist" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/whitelist",
+                       "puppet:///modules/exim/common/whitelist" ]
+          ;
+        "/etc/exim4/submission-domains":
+          require => Package["exim4-daemon-heavy"],
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/submission-domains",
+                       "puppet:///modules/exim/common/submission-domains" ]
           ;
         "/etc/logrotate.d/exim4-base":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-base",
-                       "puppet:///exim/common/logrotate-exim4-base" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/logrotate-exim4-base",
+                       "puppet:///modules/exim/common/logrotate-exim4-base" ]
           ;
         "/etc/logrotate.d/exim4-paniclog":
           require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/per-host/$fqdn/logrotate-exim4-paniclog",
-                       "puppet:///exim/common/logrotate-exim4-paniclog" ]
+          source  => [ "puppet:///modules/exim/per-host/$fqdn/logrotate-exim4-paniclog",
+                       "puppet:///modules/exim/common/logrotate-exim4-paniclog" ]
           ;
         "/etc/exim4/ssl/thishost.crt":
           require => Package["exim4-daemon-heavy"],
-          source  => "puppet:///exim/certs/$fqdn.crt",
+          source  => "puppet:///modules/exim/certs/$fqdn.crt",
           owner   => root,
           group   => Debian-exim,
           mode    => 640
           ;
         "/etc/exim4/ssl/thishost.key":
           require => Package["exim4-daemon-heavy"],
-          source  => "puppet:///exim/certs/$fqdn.key",
+          source  => "puppet:///modules/exim/certs/$fqdn.key",
           owner   => root,
           group   => Debian-exim,
           mode    => 640
           ;
         "/etc/exim4/ssl/ca.crt":
           require => Package["exim4-daemon-heavy"],
-          source  => "puppet:///exim/certs/ca.crt",
+          source  => "puppet:///modules/exim/certs/ca.crt",
           owner   => root,
           group   => Debian-exim,
           mode    => 640
           ;
         "/etc/exim4/ssl/ca.crl":
           require => Package["exim4-daemon-heavy"],
-          source  => "puppet:///exim/certs/ca.crl",
+          source  => "puppet:///modules/exim/certs/ca.crl",
           owner   => root,
           group   => Debian-exim,
           mode    => 640
@@ -156,10 +161,20 @@ class exim {
         path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }
+
+    case extractnodeinfo($nodeinfo, 'mail_port') {
+      /^(\d+)$/: { $mail_port = $1 }
+      default: { $mail_port = 'smtp' }
+    }
+
     @ferm::rule { "dsa-exim":
-            domain          => "(ip ip6)",
-            description     => "Allow smtp access",
-            rule            => "&SERVICE(tcp, 25)"
+            description     => "Allow SMTP",
+            rule            => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_SOURCES)"
+    }
+    @ferm::rule { "dsa-exim-v6":
+            description     => "Allow SMTP",
+            domain          => "ip6",
+            rule            => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_V6_SOURCES)"
     }
     # Do we actually want this?  I'm only doing it because it's harmless
     # and makes the logs quiet.  There are better ways of making logs quiet,
@@ -170,3 +185,6 @@ class exim {
             rule            => "&SERVICE(tcp, 113)"
     }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: