diff options
| author | Micah Anderson <micah@leap.se> | 2013-09-04 14:56:27 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2013-09-04 15:04:01 -0400 |
| commit | 99ffaf7ab6fb4ee39b1e2bb4977a9101cdfebec6 (patch) | |
| tree | 1e3940b75be399a6af64f1c7f5ec00d6a0e9148b | |
| parent | 64a190e046847a90d9148f4bf48441b0f2e05287 (diff) | |
need to test that /etc/init.d/shorewall exists before attempting to call it, otherwise puppet complains (#3339)
Change-Id: I7c8cc235817fe3d898157de4c4fdd8f1fe74f05a
| -rw-r--r-- | puppet/modules/site_config/manifests/initial_firewall.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/modules/site_config/manifests/initial_firewall.pp b/puppet/modules/site_config/manifests/initial_firewall.pp index 6bef0032..51cceb31 100644 --- a/puppet/modules/site_config/manifests/initial_firewall.pp +++ b/puppet/modules/site_config/manifests/initial_firewall.pp @@ -50,13 +50,13 @@ class site_config::initial_firewall { 'default_ipv4_firewall': command => '/sbin/iptables-restore < /etc/network/ipv4firewall_up.rules', logoutput => true, - unless => '/etc/init.d/shorewall status', + unless => 'test -x /etc/init.d/shorewall && /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 => '/etc/init.d/shorewall status', + unless => 'test -x /etc/init.d/shorewall && /etc/init.d/shorewall status', require => File['/etc/network/ipv6firewall_up.rules']; } } |