Commit 4b3f8eac authored by Matt Taggart's avatar Matt Taggart
Browse files

remove deprecated rfc1918 file

this hasn't been supported since 3.x days
parent 47f1ee74
...@@ -186,7 +186,6 @@ Example from node.pp: ...@@ -186,7 +186,6 @@ Example from node.pp:
shorewall::interface { 'eth0': shorewall::interface { 'eth0':
zone => 'net', zone => 'net',
rfc1918 => true,
options => 'tcpflags,nosmurfs'; options => 'tcpflags,nosmurfs';
} }
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
# #
# shorewall::interface { 'br0': # shorewall::interface { 'br0':
# zone => 'net', # zone => 'net',
# rfc1918 => true,
# options => 'tcpflags,nosmurfs,routeback,bridge'; # options => 'tcpflags,nosmurfs,routeback,bridge';
# } # }
# #
......
...@@ -27,8 +27,6 @@ class shorewall( ...@@ -27,8 +27,6 @@ class shorewall(
$proxyarp_defaults = {}, $proxyarp_defaults = {},
$nat = {}, $nat = {},
$nat_defaults = {}, $nat_defaults = {},
$rfc1918 = {},
$rfc1918_defaults = {},
$routestopped = {}, $routestopped = {},
$routestopped_defaults = {}, $routestopped_defaults = {},
$params = {}, $params = {},
...@@ -74,8 +72,6 @@ class shorewall( ...@@ -74,8 +72,6 @@ class shorewall(
'proxyarp', 'proxyarp',
# See http://www.shorewall.net/3.0/Documentation.htm#NAT # See http://www.shorewall.net/3.0/Documentation.htm#NAT
'nat', 'nat',
# See http://www.shorewall.net/3.0/Documentation.htm#rfc1918
'rfc1918',
# See http://www.shorewall.net/3.0/Documentation.htm#Routestopped # See http://www.shorewall.net/3.0/Documentation.htm#Routestopped
'routestopped', 'routestopped',
# See http://www.shorewall.net/3.0/Documentation.htm#Variables # See http://www.shorewall.net/3.0/Documentation.htm#Variables
...@@ -106,7 +102,6 @@ class shorewall( ...@@ -106,7 +102,6 @@ class shorewall(
create_resources('shorewall::masq',$masq,$masq_defaults) create_resources('shorewall::masq',$masq,$masq_defaults)
create_resources('shorewall::proxyarp',$proxyarp,$proxyarp_defaults) create_resources('shorewall::proxyarp',$proxyarp,$proxyarp_defaults)
create_resources('shorewall::nat',$nat,$nat_defaults) create_resources('shorewall::nat',$nat,$nat_defaults)
create_resources('shorewall::rfc1918',$rfc1918,$rfc1918_defaults)
create_resources('shorewall::routestopped',$routestopped, create_resources('shorewall::routestopped',$routestopped,
$routestopped_defaults) $routestopped_defaults)
create_resources('shorewall::params',$params,$params_defaults) create_resources('shorewall::params',$params,$params_defaults)
......
define shorewall::rfc1918(
$action = 'logdrop',
$order='100'
){
shorewall::entry{"rfc1918-${order}-${name}":
line => "${name} ${action}"
}
}
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