From 8dde08a3acbf2815e0cacdc4121f4f8fa2f6c0e5 Mon Sep 17 00:00:00 2001 From: Marcel Haerry Date: Thu, 4 Aug 2011 13:39:27 +0200 Subject: refactor things to use the concat module --- manifests/interface.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/interface.pp') diff --git a/manifests/interface.pp b/manifests/interface.pp index 1cb5042..1716a7e 100644 --- a/manifests/interface.pp +++ b/manifests/interface.pp @@ -20,7 +20,7 @@ define shorewall::interface( } } - shorewall::entry { "interfaces.d/${order}-${name}": + shorewall::entry { "interfaces-${order}-${name}": line => "${zone} ${name} ${broadcast} ${options_real}", } } -- cgit v1.2.3 From f4bd79a9e451c60b142cab73b87ef194532cc785 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 20 Jun 2012 13:57:24 -0400 Subject: fix another merge issue --- manifests/interface.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/interface.pp') 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}", } } -- cgit v1.2.3