extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-22 22:30:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't export CONFDIR or SHAREDIR

Browse Source 
Document CONFDIR, SHAREDIR and VARDIR
Add FILEMODE to the old reserved variable names

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-03-03 11:46:23 -08:00
parent a4414a9695
commit a963c8f955
8 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/prog.header
View File

@ -1208,8 +1208,6 @@ run_it() {
local options
local version
export CONFDIR
export SHAREDIR
export VARDIR
script=$1

2
Shorewall/Perl/prog.header6
View File

@ -1059,8 +1059,6 @@ run_it() {
local options
local version
export CONFDIR
export SHAREDIR
export VARDIR
script=$1

2
Shorewall/lib.cli
View File

@ -69,8 +69,6 @@ run_it() {
local options
local version
export CONFDIR
export SHAREDIR
export VARDIR
script=$1

2
Shorewall6/lib.cli
View File

@ -69,8 +69,6 @@ run_it() {
local options
local version
export CONFDIR
export SHAREDIR
export VARDIR
script=$1

2
docs/configuration_file_basics.xml
View File

@ -635,6 +635,8 @@ SHELL cat /etc/shorewall/rules.d/*.rules</programlisting></para>
<member>FAST</member>
<member>FILEMODE</member>
<member>HOSTNAME</member>
<member>IPT_OPTIONS</member>

35
docs/shorewall_extension_scripts.xml
View File

@ -391,6 +391,41 @@ esac</programlisting><caution>
<programlisting>if [ $COMMAND = start ]; then
...</programlisting>
</listitem>
<listitem>
<para>In addition to COMMAND, Shorewall defines three other variables
that may be used for locating Shorewall files:</para>
<itemizedlist>
<listitem>
<para>CONFDIR - The configuration directory. Will be <filename
class="directory">/etc/shorewall</filename>, <filename
class="directory">/etc/shorewall6/</filename>, <filename
class="directory">/etc/shorewall-lite</filename>, or <filename
class="directory">/etc/shorewall6-lite</filename> depending on
which product is running.</para>
</listitem>
<listitem>
<para>SHAREDIR - The product shared directory. Will be <filename
class="directory">/usr/share/shorewall</filename>, <filename
class="directory">/usr/share/shorewall6/</filename>, <filename
class="directory">/usr/share/shorewall-lite</filename>, or
<filename class="directory">/usr/share/shorewall6-lite</filename>
depending on which product is running.</para>
</listitem>
<listitem>
<para>VAREDIR - The product state directory. Defaults <filename
class="directory">/usr/share/shorewall</filename>, <filename
class="directory">/usr/share/shorewall6/</filename>, <filename
class="directory">/usr/share/shorewall-lite</filename>, or
<filename class="directory">/usr/share/shorewall6-lite</filename>
depending on which product is running, but may be overridden by an
entry in ${CONFDIR}/vardir.</para>
</listitem>
</itemizedlist>
</listitem>
</itemizedlist>
<para></para>

2
manpages/shorewall-params.xml
View File

@ -52,6 +52,8 @@
<member>FAST</member>
<member>FILEMODE</member>
<member>HOSTNAME</member>
<member>IPT_OPTIONS</member>

2
manpages6/shorewall6-params.xml
View File

@ -53,6 +53,8 @@
<member>FAST</member>
<member>FILEMODE</member>
<member>HOSTNAME</member>
<member>IPT_OPTIONS</member>