summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-09-04 10:46:38 -0400
committerMicah Anderson <micah@leap.se>2013-09-04 10:46:38 -0400
commit9ce1644df4ef08660fff2f281a0fde42f591369e (patch)
treed599197e4d10f36b7aeddcf0c86d1724e3fd7a15 /puppet/modules/site_config/manifests
parentae225f1a9d478019cd22485795e7c6c916b2845c (diff)
parent94cdd54caa0cfabb80dab35ebfe9ae02d68ddfb3 (diff)
Merge branch 'bug/3339' into develop
Diffstat (limited to 'puppet/modules/site_config/manifests')
-rw-r--r--puppet/modules/site_config/manifests/initial_firewall.pp10
1 files changed, 4 insertions, 6 deletions
diff --git a/puppet/modules/site_config/manifests/initial_firewall.pp b/puppet/modules/site_config/manifests/initial_firewall.pp
index 9178a5f2..6bef0032 100644
--- a/puppet/modules/site_config/manifests/initial_firewall.pp
+++ b/puppet/modules/site_config/manifests/initial_firewall.pp
@@ -50,15 +50,13 @@ class site_config::initial_firewall {
'default_ipv4_firewall':
command => '/sbin/iptables-restore < /etc/network/ipv4firewall_up.rules',
logoutput => true,
- unless => '/sbin/shorewall status',
- require => [ Package['shorewall'],
- File['/etc/network/ipv4firewall_up.rules'] ];
+ unless => '/etc/init.d/shorewall status',
+ require => 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 => [ Package['shorewall'],
- File['/etc/network/ipv6firewall_up.rules'] ];
+ unless => '/etc/init.d/shorewall status',
+ require => File['/etc/network/ipv6firewall_up.rules'];
}
}