diff options
| author | Matt Taggart <taggart@riseup.net> | 2017-02-10 13:33:05 -0800 |
|---|---|---|
| committer | Matt Taggart <taggart@riseup.net> | 2017-02-10 13:33:05 -0800 |
| commit | 4b3f8eac5f343b5ecd2354d16e83256b8413e807 (patch) | |
| tree | 517e1d0a4bfe8799ecff9df391940d5185594412 | |
| parent | 47f1ee74666fa00314546d01982461fa79d9da0a (diff) | |
remove deprecated rfc1918 file
this hasn't been supported since 3.x days
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | manifests/blrules.pp | 1 | ||||
| -rw-r--r-- | manifests/init.pp | 5 | ||||
| -rw-r--r-- | manifests/rfc1918.pp | 8 |
4 files changed, 0 insertions, 15 deletions
@@ -186,7 +186,6 @@ Example from node.pp: shorewall::interface { 'eth0': zone => 'net', - rfc1918 => true, options => 'tcpflags,nosmurfs'; } diff --git a/manifests/blrules.pp b/manifests/blrules.pp index d6b5550..abf7508 100644 --- a/manifests/blrules.pp +++ b/manifests/blrules.pp @@ -4,7 +4,6 @@ # # shorewall::interface { 'br0': # zone => 'net', -# rfc1918 => true, # options => 'tcpflags,nosmurfs,routeback,bridge'; # } # diff --git a/manifests/init.pp b/manifests/init.pp index 5e2da52..fa2641d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -27,8 +27,6 @@ class shorewall( $proxyarp_defaults = {}, $nat = {}, $nat_defaults = {}, - $rfc1918 = {}, - $rfc1918_defaults = {}, $routestopped = {}, $routestopped_defaults = {}, $params = {}, @@ -74,8 +72,6 @@ class shorewall( 'proxyarp', # See http://www.shorewall.net/3.0/Documentation.htm#NAT 'nat', - # See http://www.shorewall.net/3.0/Documentation.htm#rfc1918 - 'rfc1918', # See http://www.shorewall.net/3.0/Documentation.htm#Routestopped 'routestopped', # See http://www.shorewall.net/3.0/Documentation.htm#Variables @@ -106,7 +102,6 @@ class shorewall( create_resources('shorewall::masq',$masq,$masq_defaults) create_resources('shorewall::proxyarp',$proxyarp,$proxyarp_defaults) create_resources('shorewall::nat',$nat,$nat_defaults) - create_resources('shorewall::rfc1918',$rfc1918,$rfc1918_defaults) create_resources('shorewall::routestopped',$routestopped, $routestopped_defaults) create_resources('shorewall::params',$params,$params_defaults) diff --git a/manifests/rfc1918.pp b/manifests/rfc1918.pp deleted file mode 100644 index 31dce5d..0000000 --- a/manifests/rfc1918.pp +++ /dev/null @@ -1,8 +0,0 @@ -define shorewall::rfc1918( - $action = 'logdrop', - $order='100' -){ - shorewall::entry{"rfc1918-${order}-${name}": - line => "${name} ${action}" - } -} |