diff --git a/Samples/Universal/shorewall.conf b/Samples/Universal/shorewall.conf index 91db23d13..437f76d28 100644 --- a/Samples/Universal/shorewall.conf +++ b/Samples/Universal/shorewall.conf @@ -29,8 +29,6 @@ LOG_VERBOSITY=2 LOGALLNEW= -LOGBURST= - LOGFILE=/var/log/messages LOGFORMAT="Shorewall:%s:%s:" @@ -39,8 +37,6 @@ LOGTAGONLY=No LOGLIMIT= -LOGRATE= - MACLIST_LOG_LEVEL=info SFILTER_LOG_LEVEL=info @@ -134,8 +130,6 @@ EXPAND_POLICIES=Yes EXPORTMODULES=Yes -EXPORTPARAMS=No - FASTACCEPT=Yes FORWARD_CLEAR_MARK= diff --git a/Samples/one-interface/shorewall.conf b/Samples/one-interface/shorewall.conf index b834eeb81..25baa6d0a 100644 --- a/Samples/one-interface/shorewall.conf +++ b/Samples/one-interface/shorewall.conf @@ -40,8 +40,6 @@ LOG_VERBOSITY=2 LOGALLNEW= -LOGBURST= - LOGFILE=/var/log/messages LOGFORMAT="Shorewall:%s:%s:" @@ -50,8 +48,6 @@ LOGTAGONLY=No LOGLIMIT= -LOGRATE= - MACLIST_LOG_LEVEL=info SFILTER_LOG_LEVEL=info @@ -145,8 +141,6 @@ EXPAND_POLICIES=Yes EXPORTMODULES=Yes -EXPORTPARAMS=No - FASTACCEPT=No FORWARD_CLEAR_MARK= diff --git a/Samples/three-interfaces/shorewall.conf b/Samples/three-interfaces/shorewall.conf index 56c229030..101c5b4aa 100644 --- a/Samples/three-interfaces/shorewall.conf +++ b/Samples/three-interfaces/shorewall.conf @@ -38,8 +38,6 @@ LOG_VERBOSITY=2 LOGALLNEW= -LOGBURST= - LOGFILE=/var/log/messages LOGFORMAT="Shorewall:%s:%s:" @@ -48,8 +46,6 @@ LOGTAGONLY=No LOGLIMIT= -LOGRATE= - MACLIST_LOG_LEVEL=info SFILTER_LOG_LEVEL=info @@ -143,8 +139,6 @@ EXPAND_POLICIES=Yes EXPORTMODULES=Yes -EXPORTPARAMS=No - FASTACCEPT=No FORWARD_CLEAR_MARK= diff --git a/Samples/two-interfaces/shorewall.conf b/Samples/two-interfaces/shorewall.conf index e22e6a435..6d85ed6ad 100644 --- a/Samples/two-interfaces/shorewall.conf +++ b/Samples/two-interfaces/shorewall.conf @@ -41,8 +41,6 @@ LOG_VERBOSITY=2 LOGALLNEW= -LOGBURST= - LOGFILE=/var/log/messages LOGFORMAT="Shorewall:%s:%s:" @@ -51,8 +49,6 @@ LOGTAGONLY=No LOGLIMIT= -LOGRATE= - MACLIST_LOG_LEVEL=info SFILTER_LOG_LEVEL=info @@ -146,8 +142,6 @@ EXPAND_POLICIES=Yes EXPORTMODULES=Yes -EXPORTPARAMS=No - FASTACCEPT=No FORWARD_CLEAR_MARK= diff --git a/Samples6/Universal/shorewall6.conf b/Samples6/Universal/shorewall6.conf index 634688adb..d3cc9be11 100644 --- a/Samples6/Universal/shorewall6.conf +++ b/Samples6/Universal/shorewall6.conf @@ -28,16 +28,12 @@ LOG_VERBOSITY=2 LOGALLNEW= -LOGBURST= - LOGFILE= LOGFORMAT="Shorewall:%s:%s:" LOGLIMIT= -LOGRATE= - LOGTAGONLY=No MACLIST_LOG_LEVEL=info @@ -125,8 +121,6 @@ EXPAND_POLICIES=Yes EXPORTMODULES=Yes -EXPORTPARAMS=No - FASTACCEPT=Yes FORWARD_CLEAR_MARK= diff --git a/Samples6/one-interface/shorewall6.conf b/Samples6/one-interface/shorewall6.conf index e41e09d7f..54bd5a489 100644 --- a/Samples6/one-interface/shorewall6.conf +++ b/Samples6/one-interface/shorewall6.conf @@ -28,16 +28,12 @@ LOG_VERBOSITY=2 LOGALLNEW= -LOGBURST= - LOGFILE= LOGFORMAT="Shorewall:%s:%s:" LOGLIMIT= -LOGRATE= - LOGTAGONLY=No MACLIST_LOG_LEVEL=info @@ -125,8 +121,6 @@ EXPAND_POLICIES=No EXPORTMODULES=Yes -EXPORTPARAMS=No - FASTACCEPT=No FORWARD_CLEAR_MARK= diff --git a/Samples6/three-interfaces/shorewall6.conf b/Samples6/three-interfaces/shorewall6.conf index d84772ed4..03ef6f7df 100644 --- a/Samples6/three-interfaces/shorewall6.conf +++ b/Samples6/three-interfaces/shorewall6.conf @@ -28,16 +28,12 @@ LOG_VERBOSITY=2 LOGALLNEW= -LOGBURST= - LOGFILE=/var/log/messages LOGFORMAT="Shorewall:%s:%s:" LOGLIMIT= -LOGRATE= - LOGTAGONLY=No MACLIST_LOG_LEVEL=info @@ -125,8 +121,6 @@ EXPAND_POLICIES=Yes EXPORTMODULES=Yes -EXPORTPARAMS=No - FASTACCEPT=No FORWARD_CLEAR_MARK= diff --git a/Samples6/two-interfaces/shorewall6.conf b/Samples6/two-interfaces/shorewall6.conf index a757d9434..f2bbbfbdb 100644 --- a/Samples6/two-interfaces/shorewall6.conf +++ b/Samples6/two-interfaces/shorewall6.conf @@ -28,16 +28,12 @@ LOG_VERBOSITY=2 LOGALLNEW= -LOGBURST= - LOGFILE=/var/log/messages LOGFORMAT="Shorewall:%s:%s:" LOGLIMIT= -LOGRATE= - LOGTAGONLY=No MACLIST_LOG_LEVEL=info @@ -125,8 +121,6 @@ EXPAND_POLICIES=No EXPORTMODULES=Yes -EXPORTPARAMS=No - FASTACCEPT=No FORWARD_CLEAR_MARK= diff --git a/Shorewall/configfiles/shorewall.conf b/Shorewall/configfiles/shorewall.conf index 1a18600cf..5795ba1de 100644 --- a/Shorewall/configfiles/shorewall.conf +++ b/Shorewall/configfiles/shorewall.conf @@ -29,14 +29,10 @@ LOG_VERBOSITY=2 LOGALLNEW= -LOGBURST= - LOGFILE=/var/log/messages LOGFORMAT="Shorewall:%s:%s:" -LOGRATE= - LOGTAGONLY=No LOGLIMIT= @@ -134,8 +130,6 @@ EXPAND_POLICIES=Yes EXPORTMODULES=Yes -EXPORTPARAMS=No - FASTACCEPT=No FORWARD_CLEAR_MARK= diff --git a/Shorewall6/configfiles/shorewall6.conf b/Shorewall6/configfiles/shorewall6.conf index ae414dea1..e8bd3028d 100644 --- a/Shorewall6/configfiles/shorewall6.conf +++ b/Shorewall6/configfiles/shorewall6.conf @@ -28,16 +28,12 @@ LOG_VERBOSITY=2 LOGALLNEW= -LOGBURST= - LOGFILE=/var/log/messages LOGFORMAT="Shorewall:%s:%s:" LOGLIMIT= -LOGRATE= - LOGTAGONLY=No MACLIST_LOG_LEVEL=info @@ -125,8 +121,6 @@ EXPAND_POLICIES=Yes EXPORTMODULES=Yes -EXPORTPARAMS=No - FASTACCEPT=No FORWARD_CLEAR_MARK=Yes diff --git a/manpages/shorewall.conf.xml b/manpages/shorewall.conf.xml index 69ad880b5..60b851104 100644 --- a/manpages/shorewall.conf.xml +++ b/manpages/shorewall.conf.xml @@ -576,10 +576,11 @@ net all DROP infothen the chain name is 'net2all' EXPORTPARAMS={Yes|No} - (Deprecated beginning with Shorewall 4.4.17) + role="bold">Yes|No} + Deprecated in Shorewall 4.4.17. + Beginning with Shorewall 4.4.17, the variables set in the 'params' file at compile time are available at run time with EXPORTPARAMS=No. As a consequence, beginning with that version the @@ -1054,7 +1055,7 @@ net all DROP infothen the chain name is 'net2all' role="bold">LOGBURST=[burst] - + Deprecated in Shorewall 4.4.12. diff --git a/manpages6/shorewall6.conf.xml b/manpages6/shorewall6.conf.xml index 3abe2cd42..1a7110b12 100644 --- a/manpages6/shorewall6.conf.xml +++ b/manpages6/shorewall6.conf.xml @@ -500,9 +500,11 @@ net all DROP infothen the chain name is 'net2all' EXPORTPARAMS={Yes|No} - (Deprecated beginning with Shorewall 4.4.17) + + Deprecated beginning with Shorewall 4.4.17. + Beginning with Shorewall 4.4.17, the variables set in the 'params' file at compile time are available at run time with EXPORTPARAMS=No. As a consequence, beginning with that version the @@ -930,7 +932,7 @@ net all DROP infothen the chain name is 'net2all' role="bold">LOGBURST=[burst] - + Deprecated in Shorewall 4.4.12.