diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index d8487dfcb..ea9094ced 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -290,9 +290,10 @@ echo "Default config path file installed as ${PREFIX}/usr/share/shorewall-lite/c # Install the functions file # -install_file functions ${PREFIX}/usr/share/shorewall-lite/functions 0444 +install_file lib.base ${PREFIX}/usr/share/shorewall-lite/lib.base 0444 +ln -s lib.base ${PREFIX}/usr/share/shorewall-lite/functions -echo "Common functions installed in ${PREFIX}/usr/share/shorewall-lite/functions" +echo "Common functions linked through ${PREFIX}/usr/share/shorewall-lite/functions" # # Install Shorecap diff --git a/Shorewall-lite/shorewall-lite b/Shorewall-lite/shorewall-lite index 2cbdaf6e8..d620a0f03 100755 --- a/Shorewall-lite/shorewall-lite +++ b/Shorewall-lite/shorewall-lite @@ -432,7 +432,7 @@ save_config() { echo "#!/bin/sh" > $f echo "#This ipset restore file generated $(date) by Shorewall $version" >> $f echo >> $f - echo ". ${SHAREDIR}/functions" >> $f + echo ". ${SHAREDIR}/lib.base" >> $f echo >> $f grep '^MODULE' ${VARDIR}/restore-base >> $f echo "reload_kernel_modules << __EOF__" >> $f @@ -1208,7 +1208,7 @@ VARDIR=/var/lib/shorewall-lite CONFDIR=/etc/shorewall-lite export PRODUCT="Shorewall Lite" -FUNCTIONS=$SHAREDIR/functions +FUNCTIONS=$SHAREDIR/lib.base VERSION_FILE=$SHAREDIR/version HELP=$SHAREDIR/help diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index 88264c527..c0588b385 100644 --- a/Shorewall-lite/shorewall-lite.spec +++ b/Shorewall-lite/shorewall-lite.spec @@ -75,7 +75,8 @@ fi %attr(0644,root,root) /usr/share/shorewall-lite/version %attr(0644,root,root) /usr/share/shorewall-lite/configpath -%attr(0444,root,root) /usr/share/shorewall-lite/functions +/usr/share/shorewall-lite/functions +%attr(0444,root,root) /usr/share/shorewall-lite/lib.base %attr(0444,root,root) /usr/share/shorewall-lite/modules %attr(0444,root,root) /usr/share/shorewall-lite/xmodules %attr(0544,root,root) /usr/share/shorewall-lite/shorecap diff --git a/Shorewall/compiler b/Shorewall/compiler index b6590217b..918f71714 100755 --- a/Shorewall/compiler +++ b/Shorewall/compiler @@ -4651,7 +4651,7 @@ __EOF__ cat >&3 << __EOF__ -. \${SHAREDIR}/functions +. \${SHAREDIR}/lib.base __EOF__ compile_stop_firewall @@ -5365,7 +5365,7 @@ SHAREDIR=/usr/share/shorewall VARDIR=/var/lib/shorewall [ -z "$EXPORT" ] && CONFDIR=/etc/shorewall || CONFDIR=${SHAREDIR}/configfiles -FUNCTIONS=${SHAREDIR}/functions +FUNCTIONS=${SHAREDIR}/lib.base [ -n "${VERBOSE:=2}" ] diff --git a/Shorewall/firewall b/Shorewall/firewall index 3cb7921c4..305277185 100755 --- a/Shorewall/firewall +++ b/Shorewall/firewall @@ -572,7 +572,7 @@ SHAREDIR=/usr/share/shorewall VARDIR=/var/lib/shorewall CONFDIR=/etc/shorewall -FUNCTIONS=${SHAREDIR}/functions +FUNCTIONS=${SHAREDIR}/lib.base if [ -f $FUNCTIONS ]; then [ $VERBOSE -ge 2 ] && echo "Loading $FUNCTIONS..." diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 403eaa537..211ece6bd 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -287,14 +287,6 @@ if [ ! -f ${PREFIX}/etc/shorewall/zones ]; then echo "Zones file installed as ${PREFIX}/etc/shorewall/zones" fi -# -# Install the functions file -# - -install_file functions ${PREFIX}/usr/share/shorewall/functions 0444 - -echo "Common functions installed in ${PREFIX}/usr/share/shorewall/functions" - # # Install the Compiler # diff --git a/Shorewall/functions b/Shorewall/lib.base similarity index 100% rename from Shorewall/functions rename to Shorewall/lib.base diff --git a/Shorewall/shorewall b/Shorewall/shorewall index cbf2bdefe..46856a6af 100755 --- a/Shorewall/shorewall +++ b/Shorewall/shorewall @@ -473,7 +473,7 @@ save_config() { echo "#!/bin/sh" > $f echo "#This ipset restore file generated $(date) by Shorewall $version" >> $f echo >> $f - echo ". ${SHAREDIR}/functions" >> $f + echo ". ${SHAREDIR}/lib.base" >> $f echo >> $f grep '^MODULE' ${VARDIR}/restore-base >> $f echo "reload_kernel_modules << __EOF__" >> $f @@ -1744,7 +1744,7 @@ CONFDIR=/etc/shorewall export PRODUCT="Shorewall" FIREWALL=$SHAREDIR/firewall -FUNCTIONS=$SHAREDIR/functions +FUNCTIONS=$SHAREDIR/lib.base VERSION_FILE=$SHAREDIR/version HELP=$SHAREDIR/help diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index d1ae22aa5..48cce3b22 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -111,10 +111,10 @@ fi %attr(0644,root,root) /usr/share/shorewall/action.template %attr(0555,root,root) /usr/share/shorewall/compiler %attr(0444,root,root) /usr/share/shorewall/functions -%attr(0555,root,root) /usr/share/shorewall/firewall %attr(0555,root,root) /usr/share/shorewall/help %attr(0444,root,root) /usr/share/shorewall/lib.accounting %attr(0444,root,root) /usr/share/shorewall/lib.actions +%attr(0444,root,root) /usr/share/shorewall/lib.base %attr(0444,root,root) /usr/share/shorewall/lib.dynamiczones %attr(0444,root,root) /usr/share/shorewall/lib.maclist %attr(0444,root,root) /usr/share/shorewall/lib.nat diff --git a/docs/shorewall_logging.xml b/docs/shorewall_logging.xml index 50ea82d4c..10dc91fed 100644 --- a/docs/shorewall_logging.xml +++ b/docs/shorewall_logging.xml @@ -202,32 +202,6 @@ which still go to syslog). - Once you have installed ulogd, edit /etc/ulogd.conf - (/usr/local/etc/ulogd.conf if you built ulogd - yourself) and set: - - - - syslogfile <the file that you wish to log - to> - - - - syslogsync 1 - - - - Also on the firewall system: - - - touch <the file that you wish to log - to> - - - Your distribution's ulogd package may include a logrotate file in - /etc/logrotate.d. If you change the log file location, be sure to change - that logrotate file accordingly. - You will need to change all instances of log levels (usually info) in your Shorewall configuration files to ULOG - this includes entries in the policy, rules and