Remove some deprecated shorewall config options

diff --git a/cookbooks/networking/templates/default/shorewall.conf.erb b/cookbooks/networking/templates/default/shorewall.conf.erb
index 3ea0b71a2b30fd6add8c5994f44a9be8cf1c9ad9..da5c8c20278be50b634f40a5772d4df67b7722d6 100644 (file)
--- a/cookbooks/networking/templates/default/shorewall.conf.erb
+++ b/cookbooks/networking/templates/default/shorewall.conf.erb
@@ -26,10 +26,6 @@ LOGFORMAT="Shorewall:%s:%s:"
 
 LOGTAGONLY=No
 
-LOGRATE=
-
-LOGBURST=
-
 LOGALLNEW=
 
 BLACKLIST_LOGLEVEL=
@@ -117,8 +113,6 @@ MUTEX_TIMEOUT=60
 
 ADMINISABSENTMINDED=Yes
 
-BLACKLISTNEWONLY=No
-
 DELAYBLACKLISTLOAD=No
 
 MODULE_SUFFIX=ko
@@ -145,8 +139,6 @@ FASTACCEPT=No
 
 IMPLICIT_CONTINUE=Yes
 
-HIGH_ROUTE_MARKS=No
-
 USE_ACTIONS=Yes
 
 OPTIMIZE=1
@@ -173,8 +165,6 @@ RESTORE_DEFAULT_ROUTE=Yes
 
 AUTOMAKE=No
 
-WIDE_TC_MARKS=No
-
 TRACK_PROVIDERS=No
 
 ZONE2ZONE=2

diff --git a/cookbooks/networking/templates/default/shorewall6.conf.erb b/cookbooks/networking/templates/default/shorewall6.conf.erb
index 6f31ad6c80f436e8d4a08991d541b3e9828eb0a7..4fc0ffe82db3371e419499a4e7c815470c603934 100644 (file)
--- a/cookbooks/networking/templates/default/shorewall6.conf.erb
+++ b/cookbooks/networking/templates/default/shorewall6.conf.erb
@@ -26,10 +26,6 @@ LOGFORMAT="Shorewall:%s:%s:"
 
 LOGTAGONLY=No
 
-LOGRATE=
-
-LOGBURST=
-
 LOGALLNEW=
 
 BLACKLIST_LOGLEVEL=
@@ -101,16 +97,12 @@ MUTEX_TIMEOUT=60
 
 ADMINISABSENTMINDED=Yes
 
-BLACKLISTNEWONLY=No
-
 MODULE_SUFFIX=ko
 
 FASTACCEPT=No
 
 IMPLICIT_CONTINUE=Yes
 
-HIGH_ROUTE_MARKS=No
-
 OPTIMIZE=1
 
 EXPORTPARAMS=Yes
@@ -129,8 +121,6 @@ MANGLE_ENABLED=Yes
 
 AUTOMAKE=No
 
-WIDE_TC_MARKS=No
-
 TRACK_PROVIDERS=No
 
 ZONE2ZONE=2