From 7792eec3d75f40db1ed44bad7e89efc3fedbcfde Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 16 May 2016 14:45:12 +0100 Subject: [PATCH] Remove some deprecated shorewall config options --- .../networking/templates/default/shorewall.conf.erb | 10 ---------- .../networking/templates/default/shorewall6.conf.erb | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/cookbooks/networking/templates/default/shorewall.conf.erb b/cookbooks/networking/templates/default/shorewall.conf.erb index 3ea0b71a2..da5c8c202 100644 --- 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 6f31ad6c8..4fc0ffe82 100644 --- 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 -- 2.43.2