diff options
| -rw-r--r-- | puppet/modules/site_config/manifests/initial_firewall.pp | 6 | ||||
| -rw-r--r-- | puppet/modules/site_postfix/manifests/mx/smtpd_checks.pp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/puppet/modules/site_config/manifests/initial_firewall.pp b/puppet/modules/site_config/manifests/initial_firewall.pp index b9fc5ffe..9178a5f2 100644 --- a/puppet/modules/site_config/manifests/initial_firewall.pp +++ b/puppet/modules/site_config/manifests/initial_firewall.pp @@ -51,12 +51,14 @@ class site_config::initial_firewall { command => '/sbin/iptables-restore < /etc/network/ipv4firewall_up.rules', logoutput => true, unless => '/sbin/shorewall status', - require => File['/etc/network/ipv4firewall_up.rules']; + require => [ Package['shorewall'], + File['/etc/network/ipv4firewall_up.rules'] ]; 'default_ipv6_firewall': command => '/sbin/ip6tables-restore < /etc/network/ipv6firewall_up.rules', logoutput => true, unless => '/sbin/shorewall status', - require => File['/etc/network/ipv6firewall_up.rules']; + require => [ Package['shorewall'], + File['/etc/network/ipv6firewall_up.rules'] ]; } } diff --git a/puppet/modules/site_postfix/manifests/mx/smtpd_checks.pp b/puppet/modules/site_postfix/manifests/mx/smtpd_checks.pp index 795c1703..b1536d64 100644 --- a/puppet/modules/site_postfix/manifests/mx/smtpd_checks.pp +++ b/puppet/modules/site_postfix/manifests/mx/smtpd_checks.pp @@ -1,6 +1,8 @@ class site_postfix::mx::smtpd_checks { postfix::config { + 'smtpd_helo_required': + value => 'yes'; 'checks_dir': value => '$config_directory/checks'; 'smtpd_client_restrictions': |