mirror of
https://gitlab.com/shorewall/code.git
synced 2024-12-23 14:48:51 +01:00
Don't modify the .conf file installed in configfiles.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
c2e78bfaf8
commit
447d0f0b2d
@ -1,3 +1,9 @@
|
|||||||
|
Changes in Shorewall 4.4.20.1
|
||||||
|
|
||||||
|
1) Corrected FSF address.
|
||||||
|
|
||||||
|
2) Don't modify configfiles/shorewall.conf & configfiles/shorewall6.conf.
|
||||||
|
|
||||||
Changes in Shorewall 4.4.20 Final
|
Changes in Shorewall 4.4.20 Final
|
||||||
|
|
||||||
1) Set /proc/sys/net/bridge/bridge_nf_call_ip6?tables.
|
1) Set /proc/sys/net/bridge/bridge_nf_call_ip6?tables.
|
||||||
|
@ -339,9 +339,6 @@ fi
|
|||||||
#
|
#
|
||||||
run_install $OWNERSHIP -m 0644 $CONFIGFILES/shorewall.conf ${DESTDIR}/usr/share/shorewall/configfiles
|
run_install $OWNERSHIP -m 0644 $CONFIGFILES/shorewall.conf ${DESTDIR}/usr/share/shorewall/configfiles
|
||||||
|
|
||||||
perl -p -w -i -e 's|^CONFIG_PATH=.*|CONFIG_PATH=/usr/share/shorewall/configfiles:/usr/share/shorewall|;' ${DESTDIR}/usr/share/shorewall/configfiles/shorewall.conf
|
|
||||||
perl -p -w -i -e 's|^STARTUP_LOG=.*|STARTUP_LOG=/var/log/shorewall-lite-init.log|;' ${DESTDIR}/usr/share/shorewall/configfiles/shorewall.conf
|
|
||||||
|
|
||||||
if [ ! -f ${DESTDIR}/etc/shorewall/shorewall.conf ]; then
|
if [ ! -f ${DESTDIR}/etc/shorewall/shorewall.conf ]; then
|
||||||
run_install $OWNERSHIP -m 0644 $CONFIGFILES/shorewall.conf ${DESTDIR}/etc/shorewall
|
run_install $OWNERSHIP -m 0644 $CONFIGFILES/shorewall.conf ${DESTDIR}/etc/shorewall
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
----------------------------------------------------------------------------
|
----------------------------------------------------------------------------
|
||||||
S H O R E W A L L 4 . 4 . 20
|
S H O R E W A L L 4 . 4 . 20 . 1
|
||||||
----------------------------------------------------------------------------
|
----------------------------------------------------------------------------
|
||||||
|
|
||||||
I. PROBLEMS CORRECTED IN THIS RELEASE
|
I. PROBLEMS CORRECTED IN THIS RELEASE
|
||||||
@ -13,6 +13,22 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES
|
|||||||
I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E
|
I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E
|
||||||
----------------------------------------------------------------------------
|
----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
4.4.20.1
|
||||||
|
|
||||||
|
1) The address of the Free Software Foundation has been corrected in
|
||||||
|
the License files.
|
||||||
|
|
||||||
|
2) The shorewall[6].conf file installed in
|
||||||
|
/usr/share/shorewall[6]/configfiles is no longer modified for use
|
||||||
|
with Shorewall[6]-lite. When creating a new configuration for a
|
||||||
|
remote forewall, two lines need to be modified in the copy
|
||||||
|
|
||||||
|
CONFIG_PATH=/usr/share/shorewall (or shorewall6)
|
||||||
|
STARTUP_LOG=/var/log/shorewall-lite-init.log
|
||||||
|
(or shorewall6-lite-init.log)
|
||||||
|
|
||||||
|
4.4.20
|
||||||
|
|
||||||
1) Previously, when a device number was explicitly specified in
|
1) Previously, when a device number was explicitly specified in
|
||||||
/etc/shorewall/tcdevices, all unused numbers less than the one
|
/etc/shorewall/tcdevices, all unused numbers less than the one
|
||||||
specified were unavailable for allocation to following entries that
|
specified were unavailable for allocation to following entries that
|
||||||
|
@ -319,9 +319,6 @@ fi
|
|||||||
#
|
#
|
||||||
run_install $OWNERSHIP -m 0644 configfiles/shorewall6.conf ${DESTDIR}/usr/share/shorewall6/configfiles/shorewall6.conf
|
run_install $OWNERSHIP -m 0644 configfiles/shorewall6.conf ${DESTDIR}/usr/share/shorewall6/configfiles/shorewall6.conf
|
||||||
|
|
||||||
perl -p -w -i -e 's|^CONFIG_PATH=.*|CONFIG_PATH=/usr/share/shorewall6/configfiles:/usr/share/shorewall6|;' ${DESTDIR}/usr/share/shorewall6/configfiles/shorewall6.conf
|
|
||||||
perl -p -w -i -e 's|^STARTUP_LOG=.*|STARTUP_LOG=/var/log/shorewall6-lite-init.log|;' ${DESTDIR}/usr/share/shorewall6/configfiles/shorewall6.conf
|
|
||||||
|
|
||||||
if [ ! -f ${DESTDIR}/etc/shorewall6/shorewall6.conf ]; then
|
if [ ! -f ${DESTDIR}/etc/shorewall6/shorewall6.conf ]; then
|
||||||
run_install $OWNERSHIP -m 0644 configfiles/shorewall6.conf ${DESTDIR}/etc/shorewall6/shorewall6.conf
|
run_install $OWNERSHIP -m 0644 configfiles/shorewall6.conf ${DESTDIR}/etc/shorewall6/shorewall6.conf
|
||||||
|
|
||||||
|
@ -129,6 +129,23 @@
|
|||||||
</listitem>
|
</listitem>
|
||||||
</itemizedlist>
|
</itemizedlist>
|
||||||
</note>
|
</note>
|
||||||
|
|
||||||
|
<para>After copying, you may need to change two setting in the copy
|
||||||
|
of shorewall.conf:</para>
|
||||||
|
|
||||||
|
<itemizedlist>
|
||||||
|
<listitem>
|
||||||
|
<para>CONFIG_PATH=/usr/share/shorewall</para>
|
||||||
|
</listitem>
|
||||||
|
|
||||||
|
<listitem>
|
||||||
|
<para>STARTUP_LOG=/var/log/shorewall-lite-init.log</para>
|
||||||
|
</listitem>
|
||||||
|
</itemizedlist>
|
||||||
|
|
||||||
|
<para>Older versions of Shorewall included copies of shorewall.conf
|
||||||
|
with these settings already modified. This practice was discontinued
|
||||||
|
in Shorewall 4.4.20.1.</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
|
||||||
<listitem>
|
<listitem>
|
||||||
|
Loading…
Reference in New Issue
Block a user