Commit 47f1ee74 authored by Matt Taggart's avatar Matt Taggart

remove deprecated norfc1918 option

It was deprecated in 4.2.0
http://www.shorewall.net/upgrade_issues.htm
parent 8552753d
......@@ -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
#
###############################################################################
define shorewall::host(
$zone,
$options = 'tcpflags,norfc1918',
$options = 'tcpflags',
$order='100'
){
shorewall::entry{"hosts-${order}-${name}":
......
......@@ -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}",
}
}
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