Skip to content

GitLab

Commit f4bd79a9 authored by Micah Anderson's avatar Micah Anderson
Browse files
Options

fix another merge issue

parent f3448f42
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
manifests/interface.pp
View file @ f4bd79a9
...@@ -22,7 +22,7 @@ define shorewall::interface( ...@@ -22,7 +22,7 @@ define shorewall::interface(
default => '', default => '',
} }
shorewall::entry { "interfaces.d/${order}-${name}": shorewall::entry { "interfaces-${order}-${name}":
line => "${zone} ${name} ${broadcast} ${options}${dhcp_opt}${rfc1918_opt}${added_opts}", line => "${zone} ${name} ${broadcast} ${options}${dhcp_opt}${rfc1918_opt}${added_opts}",
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment