exuberant quoting

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

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 2f1bfb64ee8e26f8101ca3f90f0f3e34b853fc30..70a370294b9c17b90b99ccbefdea8299eea7adea 100644 (file)
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -1,25 +1,26 @@
 class exim::mx inherits exim {
-    include clamav
-    include postgrey
+       include clamav
+       include postgrey
 
-    file {
-        "/etc/exim4/ccTLD.txt":
-          require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/common/ccTLD.txt" ]
-          ;
-        "/etc/exim4/surbl_whitelist.txt":
-          require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/common/surbl_whitelist.txt" ]
-          ;
-        "/etc/exim4/exim_surbl.pl":
-          require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///exim/common/exim_surbl.pl" ],
-          notify  => Exec["exim4 restart"]
-          ;
-    }
-    exec { "exim4 restart":
-        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-        refreshonly => true,
-    }
-}
+       file { '/etc/exim4/ccTLD.txt':
+               source => 'puppet:///modules/exim/common/ccTLD.txt',
+       }
+       file { '/etc/exim4/surbl_whitelist.txt':
+               source => 'puppet:///modules/exim/common/surbl_whitelist.txt',
+       }
+       file { '/etc/exim4/exim_surbl.pl':
+               source  => 'puppet:///modules/exim/common/exim_surbl.pl',
+               notify  => Service['exim4'],
+       }
+
+       @ferm::rule { 'dsa-exim-submission':
+               description => 'Allow SMTP',
+               rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_SOURCES)'
+       }
+       @ferm::rule { 'dsa-exim-v6-submission':
+               description => 'Allow SMTP',
+               domain      => 'ip6',
+               rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_V6_SOURCES)',
+       }
 
+}