diff options
| author | Micah <micah@riseup.net> | 2017-02-13 15:37:50 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2017-02-13 15:37:50 +0000 |
| commit | 4da1590e18c487f1dc89d0ce1fffeb848e75794e (patch) | |
| tree | 517e1d0a4bfe8799ecff9df391940d5185594412 /manifests/init.pp | |
| parent | 054ccc9e8ee0a03e98165ee44f113ce7ccf3bc5c (diff) | |
| parent | 4b3f8eac5f343b5ecd2354d16e83256b8413e807 (diff) | |
Merge branch '5.x-2' into 'master'
5.x changes part 2
See merge request !8
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index d6b2d2a..fa2641d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -27,10 +27,6 @@ class shorewall( $proxyarp_defaults = {}, $nat = {}, $nat_defaults = {}, - $blacklist = {}, - $blacklist_defaults = {}, - $rfc1918 = {}, - $rfc1918_defaults = {}, $routestopped = {}, $routestopped_defaults = {}, $params = {}, @@ -76,10 +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#Blacklist - 'blacklist', - # 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 @@ -110,8 +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::blacklist',$blacklist,$blacklist_defaults) - create_resources('shorewall::rfc1918',$rfc1918,$rfc1918_defaults) create_resources('shorewall::routestopped',$routestopped, $routestopped_defaults) create_resources('shorewall::params',$params,$params_defaults) |