aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-06-20 13:57:24 -0400
committerMicah Anderson <micah@riseup.net>2012-06-20 13:57:24 -0400
commitf4bd79a9e451c60b142cab73b87ef194532cc785 (patch)
tree0a02a3db36d448231b79e9ab2e3d49e2870a0f00 /manifests
parentf3448f4210260c1cfee72ae709a1ae0b8902d0d4 (diff)
downloadpuppet-shorewall-f4bd79a9e451c60b142cab73b87ef194532cc785.tar.gz
puppet-shorewall-f4bd79a9e451c60b142cab73b87ef194532cc785.tar.bz2
fix another merge issue
Diffstat (limited to 'manifests')
-rw-r--r--manifests/interface.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/interface.pp b/manifests/interface.pp
index e1bca9a..403ee74 100644
--- a/manifests/interface.pp
+++ b/manifests/interface.pp
@@ -22,7 +22,7 @@ define shorewall::interface(
default => '',
}
- shorewall::entry { "interfaces.d/${order}-${name}":
+ shorewall::entry { "interfaces-${order}-${name}":
line => "${zone} ${name} ${broadcast} ${options}${dhcp_opt}${rfc1918_opt}${added_opts}",
}
}