From 805166a354606e426c572f31e169ae4f183f09ba Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 16 Apr 2012 07:21:06 -0700 Subject: [PATCH] Ressurect LOCKFILE Signed-off-by: Tom Eastep --- Shorewall/Samples/Universal/shorewall.conf | 2 ++ .../Samples/one-interface/shorewall.conf | 2 ++ .../Samples/three-interfaces/shorewall.conf | 2 ++ .../Samples/two-interfaces/shorewall.conf | 2 ++ Shorewall/configfiles/shorewall.conf | 2 ++ Shorewall/manpages/shorewall.conf.xml | 31 +++++++++++++------ Shorewall6/Samples6/Universal/shorewall6.conf | 2 ++ .../Samples6/one-interface/shorewall6.conf | 2 ++ .../Samples6/three-interfaces/shorewall6.conf | 2 ++ .../Samples6/two-interfaces/shorewall6.conf | 2 ++ Shorewall6/configfiles/shorewall6.conf | 2 ++ Shorewall6/manpages/shorewall6.conf.xml | 27 +++++++++++----- 12 files changed, 62 insertions(+), 16 deletions(-) diff --git a/Shorewall/Samples/Universal/shorewall.conf b/Shorewall/Samples/Universal/shorewall.conf index 2cabfb626..f15c5a074 100644 --- a/Shorewall/Samples/Universal/shorewall.conf +++ b/Shorewall/Samples/Universal/shorewall.conf @@ -61,6 +61,8 @@ IP= IPSET= +LOCKFILE= + MODULESDIR= PERL=/usr/bin/perl diff --git a/Shorewall/Samples/one-interface/shorewall.conf b/Shorewall/Samples/one-interface/shorewall.conf index 373146636..84b037adc 100644 --- a/Shorewall/Samples/one-interface/shorewall.conf +++ b/Shorewall/Samples/one-interface/shorewall.conf @@ -72,6 +72,8 @@ IP= IPSET= +LOCKFILE= + MODULESDIR= PERL=/usr/bin/perl diff --git a/Shorewall/Samples/three-interfaces/shorewall.conf b/Shorewall/Samples/three-interfaces/shorewall.conf index 7a5c706e8..1b95914a0 100644 --- a/Shorewall/Samples/three-interfaces/shorewall.conf +++ b/Shorewall/Samples/three-interfaces/shorewall.conf @@ -70,6 +70,8 @@ IP= IPSET= +LOCKFILE= + MODULESDIR= PERL=/usr/bin/perl diff --git a/Shorewall/Samples/two-interfaces/shorewall.conf b/Shorewall/Samples/two-interfaces/shorewall.conf index 291053d59..8f7b3c12d 100644 --- a/Shorewall/Samples/two-interfaces/shorewall.conf +++ b/Shorewall/Samples/two-interfaces/shorewall.conf @@ -73,6 +73,8 @@ IP= IPSET= +LOCKFILE= + MODULESDIR= PERL=/usr/bin/perl diff --git a/Shorewall/configfiles/shorewall.conf b/Shorewall/configfiles/shorewall.conf index 91acc561a..dc9af86ba 100644 --- a/Shorewall/configfiles/shorewall.conf +++ b/Shorewall/configfiles/shorewall.conf @@ -61,6 +61,8 @@ IP= IPSET= +LOCKFILE= + MODULESDIR= PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin" diff --git a/Shorewall/manpages/shorewall.conf.xml b/Shorewall/manpages/shorewall.conf.xml index abf031fda..72e6e7910 100644 --- a/Shorewall/manpages/shorewall.conf.xml +++ b/Shorewall/manpages/shorewall.conf.xml @@ -96,7 +96,7 @@ role="bold">none} - + @@ -106,7 +106,7 @@ role="bold">none} - + @@ -116,7 +116,7 @@ role="bold">none} - + @@ -126,7 +126,7 @@ role="bold">none} - + @@ -482,7 +482,7 @@
- + If CONFIG_PATH is not given or if it is set to the empty value then the contents of /usr/share/shorewall/configpath are @@ -814,7 +814,7 @@ net all DROP infothen the chain name is 'net2all' - +
If this variable is not set or is given an empty value @@ -938,6 +938,19 @@ net all DROP infothen the chain name is 'net2all' + + LOCKFILE=[pathname] + + + Specifies the name of the Shorewall lock file, used to prevent + simultaneous state-changing commands. If not specified, + ${VARDIR}/shorewall/lock is assumed (${VARDIR} is normally /var/lib + but can be changed when Shorewall-core is installed -- see the + output of shorewall show vardir). + + + LOG_MARTIANS=[Yes|then the chain name is 'net2all' - +
For example, using the default LOGFORMAT, the log prefix for @@ -1028,7 +1041,7 @@ net all DROP infothen the chain name is 'net2all' control your firewall after you enable this option. - + Do not use this option if the resulting log messages will @@ -1664,7 +1677,7 @@ net all DROP infothen the chain name is 'net2all' role="bold">" - + diff --git a/Shorewall6/Samples6/Universal/shorewall6.conf b/Shorewall6/Samples6/Universal/shorewall6.conf index 3779913f8..5fe0e9853 100644 --- a/Shorewall6/Samples6/Universal/shorewall6.conf +++ b/Shorewall6/Samples6/Universal/shorewall6.conf @@ -60,6 +60,8 @@ IP= IPSET= +LOCKFILE= + MODULESDIR= PERL=/usr/bin/perl diff --git a/Shorewall6/Samples6/one-interface/shorewall6.conf b/Shorewall6/Samples6/one-interface/shorewall6.conf index 98e2e46bb..f74c42f48 100644 --- a/Shorewall6/Samples6/one-interface/shorewall6.conf +++ b/Shorewall6/Samples6/one-interface/shorewall6.conf @@ -60,6 +60,8 @@ IP= IPSET= +LOCKFILE= + MODULESDIR= PERL=/usr/bin/perl diff --git a/Shorewall6/Samples6/three-interfaces/shorewall6.conf b/Shorewall6/Samples6/three-interfaces/shorewall6.conf index cb126b730..7dc9701fc 100644 --- a/Shorewall6/Samples6/three-interfaces/shorewall6.conf +++ b/Shorewall6/Samples6/three-interfaces/shorewall6.conf @@ -60,6 +60,8 @@ IP= IPSET= +LOCKFILE= + MODULESDIR= PERL=/usr/bin/perl diff --git a/Shorewall6/Samples6/two-interfaces/shorewall6.conf b/Shorewall6/Samples6/two-interfaces/shorewall6.conf index dd3b2c862..a8891f30e 100644 --- a/Shorewall6/Samples6/two-interfaces/shorewall6.conf +++ b/Shorewall6/Samples6/two-interfaces/shorewall6.conf @@ -60,6 +60,8 @@ IP= IPSET= +LOCKFILE= + MODULESDIR= PERL=/usr/bin/perl diff --git a/Shorewall6/configfiles/shorewall6.conf b/Shorewall6/configfiles/shorewall6.conf index 5e0907447..26a61aabe 100644 --- a/Shorewall6/configfiles/shorewall6.conf +++ b/Shorewall6/configfiles/shorewall6.conf @@ -60,6 +60,8 @@ IP= IPSET= +LOCKFILE= + MODULESDIR= PERL=/usr/bin/perl diff --git a/Shorewall6/manpages/shorewall6.conf.xml b/Shorewall6/manpages/shorewall6.conf.xml index 7bf77bc18..c22d921a8 100644 --- a/Shorewall6/manpages/shorewall6.conf.xml +++ b/Shorewall6/manpages/shorewall6.conf.xml @@ -82,7 +82,7 @@ role="bold">none} - + @@ -92,7 +92,7 @@ role="bold">none} - + @@ -102,7 +102,7 @@ role="bold">none} - + @@ -112,7 +112,7 @@ role="bold">none} - + @@ -829,6 +829,19 @@ net all DROP infothen the chain name is 'net2all' + + LOCKFILE=[pathname] + + + Specifies the name of the Shorewall6 lock file, used to + prevent simultaneous state-changing commands. If not specified, + ${VARDIR}/shorewall6/lock is assumed (${VARDIR} is normally /var/lib + but can be changed when Shorewall-core is installed -- see the + output of shorewall6 show vardir). + + + LOG_VERBOSITY=[number] @@ -874,7 +887,7 @@ net all DROP infothen the chain name is 'net2all' - +
For example, using the default LOGFORMAT, the log prefix for @@ -891,7 +904,7 @@ net all DROP infothen the chain name is 'net2all' control your firewall after you enable this option. - + Do not use this option if the resulting log messages will @@ -1462,7 +1475,7 @@ net all DROP infothen the chain name is 'net2all' role="bold">" - +