extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-08 16:54:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove LITEDIR from shorewall.conf and determine it at runtime

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5288 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-01-24 19:18:49 +00:00
parent 2c9721638c
commit ad3a27fc24
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Shorewall/releasenotes.txt
View File

@ -30,10 +30,6 @@ Release Highlights
Problems Corrected in 3.4.0 RC 1
None.
Other Changes in 3.4.0 RC 1
1) While most distributions store the Shorewall Lite compiled program
in /var/lib/shorewall/, Shorewall includes features that allow that
location to be changed on a per-distribution basis. The default for
@ -51,12 +47,13 @@ Other Changes in 3.4.0 RC 1
from the firewall system so it is possible for that command to
upload the compiled script to the wrong directory.
To work around this problem, a LITEDIR option has been added to
shorewall.conf. By setting that variable appropriately in each
export directory, you can cause the "shorewall [re]load" command to
upload the script to the correct directory on each firewall system.
Note that the LITEDIR setting is commented out in shorewall.conf so
you must uncomment it if you wish to assign it a value.
To work around this problem, Shorewall now determines the LITEDIR
setting on the firewall system and uses that setting for uploading
the compiled script.
Other Changes in 3.4.0 RC 1
None.
Migration Considerations:

7
Shorewall/shorewall
View File

@ -941,10 +941,9 @@ reload_command() # $* = original arguments less the command.
;;
esac
if [ -f $directory/shorewall.conf ]; then
litedir=$(grep '^\s*LITEDIR=' $directory/shorewall.conf | tail -n 1)
[ -n "$litedir" ] && LITEDIR=${litedir#*=}
fi
litedir=$(ssh ${root}@${system} /sbin/shorewall-lite show config 2> /dev/null | grep ^LITEDIR | sed 's/LITEDIR is //')
[ -n "$litedir" ] && LITEDIR=$litedir
if [ -z "$getcaps" ]; then
SHOREWALL_DIR=$(resolve_file $directory)

2
Shorewall/shorewall.conf
View File

@ -72,8 +72,6 @@ RESTOREFILE=
IPSECFILE=zones
#LITEDIR=/var/lib/shorewall-lite
###############################################################################
# D E F A U L T A C T I O N S / M A C R O S
###############################################################################