X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostfix%2Fmanifests%2Finit.pp;fp=modules%2Fpostfix%2Fmanifests%2Finit.pp;h=49c84af20ed52d6aab9d49b4a65d254f63ca60fc;hb=626dbc05cde86f316d72fea412a7f786a59a1a19;hp=3367cbb0479d21f03d17df6ccd7610792680560e;hpb=2df9a9bac3e0c1ca36aa0d427056196c0cbe1d92;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postfix/manifests/init.pp b/modules/postfix/manifests/init.pp
index 3367cbb04..49c84af20 100644
--- a/modules/postfix/manifests/init.pp
+++ b/modules/postfix/manifests/init.pp
@@ -7,6 +7,8 @@ class postfix {
 		ensure => running
 	}
 
+	include debian_org::mail_incoming_port
+
 	munin::check { 'ps_exim4':       ensure => absent }
 	munin::check { 'exim_mailqueue': ensure => absent }
 	munin::check { 'exim_mailstats': ensure => absent }
@@ -16,12 +18,4 @@ class postfix {
 	munin::check { 'postfix_mailvolume': }
 	munin::check { 'ps_smtp': script => 'ps_' }
 	munin::check { 'ps_smtpd': script => 'ps_' }
-
-	if has_role('lists') {
-		@ferm::rule { 'smtp':
-			domain      => '(ip ip6)',
-			description => 'Allow smtp access',
-			rule        => '&SERVICE(tcp, 25)'
-		}
-	}
 }