summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-09-03 10:54:28 -0400
committerMicah Anderson <micah@leap.se>2013-09-03 11:18:34 -0400
commit9e66f8128274a8c82d3af50597b8a61061153186 (patch)
tree41cb95c76d26f502269ca90049ca11218a9c3a4b /puppet
parent8d69a43fe97079f9595ed460bfa36c4bfd6cb0a8 (diff)
require that shorewall has been installed before execs are run (#3339)
Change-Id: Iae2b1cacd64565931cef77194a733aeae681efaf
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_config/manifests/initial_firewall.pp6
1 files changed, 4 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'] ];
}
}