From: Micah Anderson Date: Wed, 20 Jun 2012 17:57:24 +0000 (-0400) Subject: fix another merge issue X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f4bd79a9e451c60b142cab73b87ef194532cc785;p=puppet-shorewall.git fix another merge issue --- 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}", } }