X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=956cdc099d0b5464e66fef24383f5ee9fa87586f;hb=fa65dcc5c85450bb77a8153a3dfbf68517d2eb61;hp=6193cb46ec9f9e55bddeefd3dd32d0c0d10e19de;hpb=cb91b9d2b274f02e72a4b85d513ef1dc1f0266d1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 6193cb46e..956cdc099 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -146,7 +146,7 @@ class exim {
           ;
         "/var/log/exim4":
           mode    => 2750,
-          ensure  => directory
+          ensure  => directory,
           owner   => Debian-exim,
           group   => maillog
           ;
@@ -156,4 +156,21 @@ class exim {
         path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }
+    @ferm::rule { "dsa-exim":
+            description     => "Allow SMTP",
+            rule            => "&SERVICE_RANGE(tcp, smtp, \$SMTP_SOURCES)"
+    }
+    @ferm::rule { "dsa-exim-v6":
+            description     => "Allow SMTP",
+            domain          => "ip6",
+            rule            => "&SERVICE_RANGE(tcp, smtp, \$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,
+    # though.
+    @ferm::rule { "dsa-ident":
+            domain          => "(ip ip6)",
+            description     => "Allow ident access",
+            rule            => "&SERVICE(tcp, 113)"
+    }
 }