extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-04-26 12:18:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename 'functions' to 'lib.base'

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4499 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-09-03 16:23:15 +00:00
parent fcee2d620b
commit 828c16fac0
10 changed files with 13 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Shorewall-lite/install.sh
View File

@ -290,9 +290,10 @@ echo "Default config path file installed as ${PREFIX}/usr/share/shorewall-lite/c
# Install the functions file # 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 # Install Shorecap

4
Shorewall-lite/shorewall-lite
View File

@ -432,7 +432,7 @@ save_config() {
echo "#!/bin/sh" > $f echo "#!/bin/sh" > $f
echo "#This ipset restore file generated $(date) by Shorewall $version" >> $f echo "#This ipset restore file generated $(date) by Shorewall $version" >> $f
echo >> $f echo >> $f
echo ". ${SHAREDIR}/functions" >> $f echo ". ${SHAREDIR}/lib.base" >> $f
echo >> $f echo >> $f
grep '^MODULE' ${VARDIR}/restore-base >> $f grep '^MODULE' ${VARDIR}/restore-base >> $f
echo "reload_kernel_modules << __EOF__" >> $f echo "reload_kernel_modules << __EOF__" >> $f
@ -1208,7 +1208,7 @@ VARDIR=/var/lib/shorewall-lite
CONFDIR=/etc/shorewall-lite CONFDIR=/etc/shorewall-lite
export PRODUCT="Shorewall Lite" export PRODUCT="Shorewall Lite"
FUNCTIONS=$SHAREDIR/functions FUNCTIONS=$SHAREDIR/lib.base
VERSION_FILE=$SHAREDIR/version VERSION_FILE=$SHAREDIR/version
HELP=$SHAREDIR/help HELP=$SHAREDIR/help

3
Shorewall-lite/shorewall-lite.spec
View File

@ -75,7 +75,8 @@ fi
%attr(0644,root,root) /usr/share/shorewall-lite/version %attr(0644,root,root) /usr/share/shorewall-lite/version
%attr(0644,root,root) /usr/share/shorewall-lite/configpath %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/modules
%attr(0444,root,root) /usr/share/shorewall-lite/xmodules %attr(0444,root,root) /usr/share/shorewall-lite/xmodules
%attr(0544,root,root) /usr/share/shorewall-lite/shorecap %attr(0544,root,root) /usr/share/shorewall-lite/shorecap

4
Shorewall/compiler
View File

@ -4651,7 +4651,7 @@ __EOF__
cat >&3 << __EOF__ cat >&3 << __EOF__
. \${SHAREDIR}/functions . \${SHAREDIR}/lib.base
__EOF__ __EOF__
compile_stop_firewall compile_stop_firewall
@ -5365,7 +5365,7 @@ SHAREDIR=/usr/share/shorewall
VARDIR=/var/lib/shorewall VARDIR=/var/lib/shorewall
[ -z "$EXPORT" ] && CONFDIR=/etc/shorewall || CONFDIR=${SHAREDIR}/configfiles [ -z "$EXPORT" ] && CONFDIR=/etc/shorewall || CONFDIR=${SHAREDIR}/configfiles
FUNCTIONS=${SHAREDIR}/functions FUNCTIONS=${SHAREDIR}/lib.base
[ -n "${VERBOSE:=2}" ] [ -n "${VERBOSE:=2}" ]

2
Shorewall/firewall
View File

@ -572,7 +572,7 @@ SHAREDIR=/usr/share/shorewall
VARDIR=/var/lib/shorewall VARDIR=/var/lib/shorewall
CONFDIR=/etc/shorewall CONFDIR=/etc/shorewall
FUNCTIONS=${SHAREDIR}/functions FUNCTIONS=${SHAREDIR}/lib.base
if [ -f $FUNCTIONS ]; then if [ -f $FUNCTIONS ]; then
[ $VERBOSE -ge 2 ] && echo "Loading $FUNCTIONS..." [ $VERBOSE -ge 2 ] && echo "Loading $FUNCTIONS..."

8
Shorewall/install.sh
View File

@ -287,14 +287,6 @@ if [ ! -f ${PREFIX}/etc/shorewall/zones ]; then
echo "Zones file installed as ${PREFIX}/etc/shorewall/zones" echo "Zones file installed as ${PREFIX}/etc/shorewall/zones"
fi 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 # Install the Compiler
# #

0
Shorewall/functions → Shorewall/lib.base
View File

4
Shorewall/shorewall
View File

@ -473,7 +473,7 @@ save_config() {
echo "#!/bin/sh" > $f echo "#!/bin/sh" > $f
echo "#This ipset restore file generated $(date) by Shorewall $version" >> $f echo "#This ipset restore file generated $(date) by Shorewall $version" >> $f
echo >> $f echo >> $f
echo ". ${SHAREDIR}/functions" >> $f echo ". ${SHAREDIR}/lib.base" >> $f
echo >> $f echo >> $f
grep '^MODULE' ${VARDIR}/restore-base >> $f grep '^MODULE' ${VARDIR}/restore-base >> $f
echo "reload_kernel_modules << __EOF__" >> $f echo "reload_kernel_modules << __EOF__" >> $f
@ -1744,7 +1744,7 @@ CONFDIR=/etc/shorewall
export PRODUCT="Shorewall" export PRODUCT="Shorewall"
FIREWALL=$SHAREDIR/firewall FIREWALL=$SHAREDIR/firewall
FUNCTIONS=$SHAREDIR/functions FUNCTIONS=$SHAREDIR/lib.base
VERSION_FILE=$SHAREDIR/version VERSION_FILE=$SHAREDIR/version
HELP=$SHAREDIR/help HELP=$SHAREDIR/help

2
Shorewall/shorewall.spec
View File

@ -111,10 +111,10 @@ fi
%attr(0644,root,root) /usr/share/shorewall/action.template %attr(0644,root,root) /usr/share/shorewall/action.template
%attr(0555,root,root) /usr/share/shorewall/compiler %attr(0555,root,root) /usr/share/shorewall/compiler
%attr(0444,root,root) /usr/share/shorewall/functions %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(0555,root,root) /usr/share/shorewall/help
%attr(0444,root,root) /usr/share/shorewall/lib.accounting %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.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.dynamiczones
%attr(0444,root,root) /usr/share/shorewall/lib.maclist %attr(0444,root,root) /usr/share/shorewall/lib.maclist
%attr(0444,root,root) /usr/share/shorewall/lib.nat %attr(0444,root,root) /usr/share/shorewall/lib.nat

26
docs/shorewall_logging.xml
View File

@ -202,32 +202,6 @@
which still go to syslog).</para> which still go to syslog).</para>
</note> </note>
<para>Once you have installed ulogd, edit /etc/ulogd.conf
(<filename>/usr/local/etc/ulogd.conf</filename> if you built ulogd
yourself) and set:</para>
<orderedlist>
<listitem>
<para>syslogfile &lt;<emphasis>the file that you wish to log
to</emphasis>&gt;</para>
</listitem>
<listitem>
<para>syslogsync 1</para>
</listitem>
</orderedlist>
<para>Also on the firewall system:</para>
<simplelist>
<member>touch &lt;<emphasis>the file that you wish to log
to</emphasis>&gt;</member>
</simplelist>
<para>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.</para>
<para>You will need to change all instances of log levels (usually <para>You will need to change all instances of log levels (usually
<quote>info</quote>) in your Shorewall configuration files to <quote>info</quote>) in your Shorewall configuration files to
<quote>ULOG</quote> - this includes entries in the policy, rules and <quote>ULOG</quote> - this includes entries in the policy, rules and