summaryrefslogtreecommitdiff
path: root/puppet/modules/site_config/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-09-03 15:47:18 -0400
committerMicah Anderson <micah@leap.se>2013-09-03 15:47:18 -0400
commit94cdd54caa0cfabb80dab35ebfe9ae02d68ddfb3 (patch)
tree53f7fd1fa0ed246dbb260eb098d7f1c0dd1c0386 /puppet/modules/site_config/manifests
parent9e66f8128274a8c82d3af50597b8a61061153186 (diff)
Work around for shorewall not being available at the site_config stage (#3339)
Change-Id: Id3138cb967f76380b7f4e22ce862a099cb47669e
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'];
}
}