X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=4acee3b695a551c3eb158d3d48c78841fcdca13f;hb=446a74676ae69d25525215b8f57158d71e5a47f6;hp=ac47c014be2be69b85b91b673891a79789290b7a;hpb=fca01ed53d923c12023e4b7102bd31060cfc9614;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index ac47c014b..4acee3b69 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -24,14 +24,14 @@ class exim {
           purge   => true,
           force   => true,
           recurse => true,
-          source  => "puppet:///empty/"
+          source  => "puppet:///files/empty/"
         ;
         "/etc/exim4/conf.d":
           ensure  => directory,
           purge   => true,
           force   => true,
           recurse => true,
-          source  => "puppet:///empty/"
+          source  => "puppet:///files/empty/"
         ;
         "/etc/exim4/ssl":
           ensure  => directory,
@@ -144,10 +144,21 @@ class exim {
           group   => Debian-exim,
           mode    => 640
           ;
+        "/var/log/exim4":
+          mode    => 2750,
+          ensure  => directory,
+          owner   => Debian-exim,
+          group   => maillog
+          ;
     }
 
     exec { "exim4 reload":
         path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }
+    ferm::rule { "dsa-exim":
+            domain          => (ip ip6),
+            description     => "Allow smtp access",
+            rule            => "proto tcp mod state state (NEW) dport (25) ACCEPT"
+    }
 }