Fix LITEDIR Mess

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6810 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Shorewall-lite/configpath

@@ -5,19 +5,3 @@
 #
 
 CONFIG_PATH=/etc/shorewall-lite:/usr/share/shorewall-lite
-
-#
-# SHOREWALL LITE'S FIREWALL SCRIPT DIRECTORY
-#
-# There is lack of agreement about where exactly in the file hierarchy the 
-# firewall script in Shorewall Lite systems should be stored. To allow 
-# everyone's opinion to prevail (and to prevent the Shorewall author from
-# going crazy), the LITEDIR option allows you to decide where the file will
-# be stored on Shorewall Lite systems under your distribution.
-#
-# a) You *must* set a value for this option
-# b) The same value must be configured in
-#    /usr/share/shorewall/configpath in your Shorewall package
-#    system(s).
-
-LITEDIR=/var/lib/shorewall-lite

Shorewall-lite/shorewall-lite

@@ -467,10 +467,13 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
 MUTEX_TIMEOUT=
 
 SHAREDIR=/usr/share/shorewall-lite
-VARDIR=/var/lib/shorewall-lite
 CONFDIR=/etc/shorewall-lite
 export PRODUCT="Shorewall Lite"
 
+[ -f ${CONFDIR}/vardir ] && . ${CONFDIR}/vardir ]
+
+[ -n "${VARDIR:=/var/lib/shorewall-lite}" ]
+
 LIBRARIES="$SHAREDIR/lib.base $SHAREDIR/lib.cli"
 VERSION_FILE=$SHAREDIR/version
 HELP=$SHAREDIR/help
@@ -500,12 +503,12 @@ else
     exit 2
 fi
 
-[ -n "${LITEDIR}" -a -f ${LITEDIR}/firewall.conf ] && . ${LITEDIR}/firewall.conf
-
 ensure_config_path
 export CONFIG_PATH
 
-[ -n "$LITEDIR" ] || { echo "   ERROR: LITEDIR not defined in ${SHAREDIR}/configpath" >&2; exit 2; }
+LITEDIR=${VARDIR}
+
+[ -f ${LITEDIR}/firewall.conf ] && . ${LITEDIR}/firewall.conf
 
 get_config