Have postfix include debian_org::mail_incoming_port also

[mirror/dsa-puppet.git] / modules / postfix / manifests / init.pp

diff --git a/modules/postfix/manifests/init.pp b/modules/postfix/manifests/init.pp
index 3367cbb..49c84af 100644 (file)
--- 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)'
-               }
-       }
 }