diff options
author | Micah Anderson <micah@riseup.net> | 2017-06-23 10:50:25 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2017-06-23 10:50:25 -0400 |
commit | 65c3fe2d6084a50e5b0e189d982afe4cbde3f14b (patch) | |
tree | e3c1c3683407ba493b90e28af2ddf6ecbe766873 /manifests/interface.pp | |
parent | e0248f504ada8efb5184f43cbaf61097ce1ddd65 (diff) | |
parent | 837fd3f29f09727d5a20514d7549837b8d8b4997 (diff) |
Merge branch 'master' into puppet4
Diffstat (limited to 'manifests/interface.pp')
-rw-r--r-- | manifests/interface.pp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/manifests/interface.pp b/manifests/interface.pp index 403ee74..670e477 100644 --- a/manifests/interface.pp +++ b/manifests/interface.pp @@ -1,9 +1,8 @@ define shorewall::interface( $zone, $broadcast = 'detect', - $options = 'tcpflags,blacklist,routefilter,nosmurfs,logmartians', + $options = 'tcpflags,routefilter,nosmurfs,logmartians', $add_options = '', - $rfc1918 = false, $dhcp = false, $order = 100 ){ @@ -17,13 +16,8 @@ define shorewall::interface( default => ',dhcp', } - $rfc1918_opt = $rfc1918 ? { - false => ',norfc1918', - default => '', - } - shorewall::entry { "interfaces-${order}-${name}": - line => "${zone} ${name} ${broadcast} ${options}${dhcp_opt}${rfc1918_opt}${added_opts}", + line => "${zone} ${name} ${broadcast} ${options}${dhcp_opt}${added_opts}", } } |