From 037e92a60e90e3563ea52afd7b53bd2da1df808c Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 1 Aug 2015 14:28:12 -0700 Subject: [PATCH] Eliminate some config options Signed-off-by: Tom Eastep --- Shorewall/Samples/Universal/shorewall.conf | 2 -- Shorewall/Samples/one-interface/shorewall.conf | 2 -- Shorewall/Samples/three-interfaces/shorewall.conf | 2 -- Shorewall/Samples/two-interfaces/shorewall.conf | 2 -- Shorewall/configfiles/shorewall.conf | 2 -- Shorewall/manpages/shorewall.conf.xml | 6 +++--- Shorewall6/Samples6/Universal/shorewall6.conf | 2 -- Shorewall6/Samples6/one-interface/shorewall6.conf | 2 -- Shorewall6/Samples6/three-interfaces/shorewall6.conf | 2 -- Shorewall6/Samples6/two-interfaces/shorewall6.conf | 2 -- Shorewall6/configfiles/shorewall6.conf | 2 -- Shorewall6/manpages/shorewall6.conf.xml | 6 +++--- 12 files changed, 6 insertions(+), 26 deletions(-) diff --git a/Shorewall/Samples/Universal/shorewall.conf b/Shorewall/Samples/Universal/shorewall.conf index 22e0f7c02..b60db3036 100644 --- a/Shorewall/Samples/Universal/shorewall.conf +++ b/Shorewall/Samples/Universal/shorewall.conf @@ -176,8 +176,6 @@ KEEP_RT_TABLES=No LOAD_HELPERS_ONLY=Yes -LEGACY_FASTSTART=No - LEGACY_RESTART=Yes MACLIST_TABLE=filter diff --git a/Shorewall/Samples/one-interface/shorewall.conf b/Shorewall/Samples/one-interface/shorewall.conf index 3e3a455db..8b1c16081 100644 --- a/Shorewall/Samples/one-interface/shorewall.conf +++ b/Shorewall/Samples/one-interface/shorewall.conf @@ -187,8 +187,6 @@ KEEP_RT_TABLES=No LOAD_HELPERS_ONLY=Yes -LEGACY_FASTSTART=No - LEGACY_RESTART=Yes MACLIST_TABLE=filter diff --git a/Shorewall/Samples/three-interfaces/shorewall.conf b/Shorewall/Samples/three-interfaces/shorewall.conf index e5bf648ab..ab12ca302 100644 --- a/Shorewall/Samples/three-interfaces/shorewall.conf +++ b/Shorewall/Samples/three-interfaces/shorewall.conf @@ -184,8 +184,6 @@ KEEP_RT_TABLES=No LOAD_HELPERS_ONLY=Yes -LEGACY_FASTSTART=No - LEGACY_RESTART=Yes MACLIST_TABLE=filter diff --git a/Shorewall/Samples/two-interfaces/shorewall.conf b/Shorewall/Samples/two-interfaces/shorewall.conf index 492cd12e8..1e52da00c 100644 --- a/Shorewall/Samples/two-interfaces/shorewall.conf +++ b/Shorewall/Samples/two-interfaces/shorewall.conf @@ -187,8 +187,6 @@ KEEP_RT_TABLES=No LOAD_HELPERS_ONLY=Yes -LEGACY_FASTSTART=No - LEGACY_RESTART=Yes MACLIST_TABLE=filter diff --git a/Shorewall/configfiles/shorewall.conf b/Shorewall/configfiles/shorewall.conf index 63be663d8..5bf52ea44 100644 --- a/Shorewall/configfiles/shorewall.conf +++ b/Shorewall/configfiles/shorewall.conf @@ -174,8 +174,6 @@ IP_FORWARDING=On KEEP_RT_TABLES=No -LEGACY_FASTSTART=Yes - LEGACY_RESTART=Yes LOAD_HELPERS_ONLY=Yes diff --git a/Shorewall/manpages/shorewall.conf.xml b/Shorewall/manpages/shorewall.conf.xml index b4412ad52..51b60cea3 100644 --- a/Shorewall/manpages/shorewall.conf.xml +++ b/Shorewall/manpages/shorewall.conf.xml @@ -656,8 +656,8 @@ Specifies where configuration files other than shorewall.conf may be found. CONFIG_PATH is specifies as a list of directory names - separated by colons (":"). When looking for a configuration file - other than shorewall.conf: + separated by colons (":"). When looking for a configuration + file: @@ -2073,7 +2073,7 @@ LOG:info:,bar net fw Perl executable. Default is /usr/bin/perl. If the pathname specified by this option does not exist or the named file is not executable, then Shorewall falls back to - /usr/bin/perl/ + /usr/bin/perl diff --git a/Shorewall6/Samples6/Universal/shorewall6.conf b/Shorewall6/Samples6/Universal/shorewall6.conf index 59537f65b..55494447f 100644 --- a/Shorewall6/Samples6/Universal/shorewall6.conf +++ b/Shorewall6/Samples6/Universal/shorewall6.conf @@ -163,8 +163,6 @@ IP_FORWARDING=Off KEEP_RT_TABLES=Yes -LEGACY_FASTSTART=No - LEGACY_RESTART=Yes LOAD_HELPERS_ONLY=Yes diff --git a/Shorewall6/Samples6/one-interface/shorewall6.conf b/Shorewall6/Samples6/one-interface/shorewall6.conf index 968694ca7..5683d3930 100644 --- a/Shorewall6/Samples6/one-interface/shorewall6.conf +++ b/Shorewall6/Samples6/one-interface/shorewall6.conf @@ -164,8 +164,6 @@ IP_FORWARDING=Off KEEP_RT_TABLES=Yes -LEGACY_FASTSTART=No - LEGACY_RESTART=Yes LOAD_HELPERS_ONLY=Yes diff --git a/Shorewall6/Samples6/three-interfaces/shorewall6.conf b/Shorewall6/Samples6/three-interfaces/shorewall6.conf index 9570990f5..67b11501b 100644 --- a/Shorewall6/Samples6/three-interfaces/shorewall6.conf +++ b/Shorewall6/Samples6/three-interfaces/shorewall6.conf @@ -163,8 +163,6 @@ IP_FORWARDING=On KEEP_RT_TABLES=Yes -LEGACY_FASTSTART=No - LEGACY_RESTART=Yes LOAD_HELPERS_ONLY=Yes diff --git a/Shorewall6/Samples6/two-interfaces/shorewall6.conf b/Shorewall6/Samples6/two-interfaces/shorewall6.conf index 91f1bce0b..ce017cd8a 100644 --- a/Shorewall6/Samples6/two-interfaces/shorewall6.conf +++ b/Shorewall6/Samples6/two-interfaces/shorewall6.conf @@ -163,8 +163,6 @@ IP_FORWARDING=On KEEP_RT_TABLES=Yes -LEGACY_FASTSTART=No - LEGACY_RESTART=Yes LOAD_HELPERS_ONLY=Yes diff --git a/Shorewall6/configfiles/shorewall6.conf b/Shorewall6/configfiles/shorewall6.conf index 08c40af35..196d65649 100644 --- a/Shorewall6/configfiles/shorewall6.conf +++ b/Shorewall6/configfiles/shorewall6.conf @@ -163,8 +163,6 @@ IP_FORWARDING=Off KEEP_RT_TABLES=Yes -LEGACY_FASTSTART=No - LEGACY_RESTART=Yes LOAD_HELPERS_ONLY=Yes diff --git a/Shorewall6/manpages/shorewall6.conf.xml b/Shorewall6/manpages/shorewall6.conf.xml index f8862edf2..ac6412ba2 100644 --- a/Shorewall6/manpages/shorewall6.conf.xml +++ b/Shorewall6/manpages/shorewall6.conf.xml @@ -585,8 +585,8 @@ Specifies where configuration files other than shorewall6.conf may be found. CONFIG_PATH is specifies as a list of directory names - separated by colons (":"). When looking for a configuration file - other than shorewall6.conf: + separated by colons (":"). When looking for a configuration + file: @@ -1809,7 +1809,7 @@ LOG:info:,bar net fw Perl executable. Default is /usr/bin/perl. If the pathname specified by this option does not exist or the named file is not executable, then Shorewall6 falls back to - /usr/bin/perl/ + /usr/bin/perl