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

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 8ab4f6255..956cdc099 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -156,9 +156,21 @@ class exim {
         path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }
-    ferm::rule { "dsa-exim":
+    @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 smtp access",
-            rule            => "proto tcp mod state state (NEW) dport (25) ACCEPT"
+            description     => "Allow ident access",
+            rule            => "&SERVICE(tcp, 113)"
     }
 }