From 47f1ee74666fa00314546d01982461fa79d9da0a Mon Sep 17 00:00:00 2001
From: Matt Taggart <taggart@riseup.net>
Date: Fri, 10 Feb 2017 13:24:59 -0800
Subject: remove deprecated norfc1918 option

It was deprecated in 4.2.0
http://www.shorewall.net/upgrade_issues.htm
---
 files/boilerplate/params.header | 4 ++--
 manifests/host.pp               | 2 +-
 manifests/interface.pp          | 8 +-------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/files/boilerplate/params.header b/files/boilerplate/params.header
index b258b0d..c4dd504 100644
--- a/files/boilerplate/params.header
+++ b/files/boilerplate/params.header
@@ -13,7 +13,7 @@
 #
 #               NET_IF=eth0
 #               NET_BCAST=130.252.100.255
-#               NET_OPTIONS=routefilter,norfc1918
+#               NET_OPTIONS=routefilter
 #
 #       Example (/etc/shorewall/interfaces record):
 #
@@ -21,6 +21,6 @@
 #
 #       The result will be the same as if the record had been written
 #
-#               net     eth0            130.252.100.255 routefilter,norfc1918
+#               net     eth0            130.252.100.255 routefilter
 #
 ###############################################################################
diff --git a/manifests/host.pp b/manifests/host.pp
index 370be03..fe12247 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -1,6 +1,6 @@
 define shorewall::host(
     $zone,
-    $options = 'tcpflags,norfc1918',
+    $options = 'tcpflags',
     $order='100'
 ){
     shorewall::entry{"hosts-${order}-${name}":
diff --git a/manifests/interface.pp b/manifests/interface.pp
index b3d66c6..670e477 100644
--- a/manifests/interface.pp
+++ b/manifests/interface.pp
@@ -3,7 +3,6 @@ define shorewall::interface(
     $broadcast = 'detect',
     $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}",
     }
 }
 
-- 
cgit v1.2.3