summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2013-09-03 12:28:59 -0400
committerMicah Anderson <micah@leap.se>2013-09-03 12:28:59 -0400
commit66fcf9bd9595a09d70e7d4131660340be5ae603e (patch)
tree41cb95c76d26f502269ca90049ca11218a9c3a4b /puppet
parent53244ecd2e31599379b5ee12fd5a95603f565191 (diff)
parent9e66f8128274a8c82d3af50597b8a61061153186 (diff)
Merge branch 'bug/3339' into develop
Conflicts: puppet/modules/site_config/manifests/initial_firewall.pp Change-Id: I794d057dc5d89133e552dd12939e8b9792cf1611
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_config/manifests/initial_firewall.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/modules/site_config/manifests/initial_firewall.pp b/puppet/modules/site_config/manifests/initial_firewall.pp
index 36a556e4..9178a5f2 100644
--- a/puppet/modules/site_config/manifests/initial_firewall.pp
+++ b/puppet/modules/site_config/manifests/initial_firewall.pp
@@ -59,6 +59,6 @@ class site_config::initial_firewall {
logoutput => true,
unless => '/sbin/shorewall status',
require => [ Package['shorewall'],
- File['/etc/network/ipv6firewall_up.rules'];
+ File['/etc/network/ipv6firewall_up.rules'] ];
}
}