diff options
author | Micah Anderson <micah@leap.se> | 2014-05-22 16:38:28 -0400 |
---|---|---|
committer | Micah Anderson <micah@leap.se> | 2014-05-22 16:38:28 -0400 |
commit | 6100b6ded99241f10e7fb12c13a0820fda084912 (patch) | |
tree | 863a9120010f32fdae304af94cd102c1da5096a6 /puppet/modules/site_config/manifests/initial_firewall.pp | |
parent | 327d5c934e408f90011d7949b89ab01fed88998e (diff) | |
parent | a622e49c5df2150049afb6f6ed47177537b7e6da (diff) |
Merge branch 'develop' (0.5.1)0.5.1
Change-Id: I4e9d845f9758232f4da0d4bfbf785e52982b825b
Diffstat (limited to 'puppet/modules/site_config/manifests/initial_firewall.pp')
-rw-r--r-- | puppet/modules/site_config/manifests/initial_firewall.pp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/puppet/modules/site_config/manifests/initial_firewall.pp b/puppet/modules/site_config/manifests/initial_firewall.pp index 51cceb31..93cfb847 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 => 'test -x /etc/init.d/shorewall && /etc/init.d/shorewall status', + subscribe => File['/etc/network/ipv4firewall_up.rules'], require => File['/etc/network/ipv4firewall_up.rules']; 'default_ipv6_firewall': command => '/sbin/ip6tables-restore < /etc/network/ipv6firewall_up.rules', logoutput => true, - unless => 'test -x /etc/init.d/shorewall && /etc/init.d/shorewall status', + unless => 'test -x /etc/init.d/shorewall6 && /etc/init.d/shorewall6 status', + subscribe => File['/etc/network/ipv6firewall_up.rules'], require => File['/etc/network/ipv6firewall_up.rules']; } } |