mirror of
https://gitlab.com/shorewall/code.git
synced 2025-01-10 15:48:13 +01:00
Fix install scripts (again)
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
a0abb11f67
commit
0dde75d345
@ -273,7 +273,7 @@ if [ ! -f ${PREFIX}/etc/shorewall/shorewall.conf ]; then
|
|||||||
#
|
#
|
||||||
# Make a Debian-like shorewall.conf
|
# Make a Debian-like shorewall.conf
|
||||||
#
|
#
|
||||||
perl -p -w -i -e 's|^STARTUP_ENABLED=.*|STARTUP_ENABLED=Yes|;' ${PREFIX}/etc/shorewall.conf
|
perl -p -w -i -e 's|^STARTUP_ENABLED=.*|STARTUP_ENABLED=Yes|;' ${PREFIX}/etc/shorewall/shorewall.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Config file installed as ${PREFIX}/etc/shorewall/shorewall.conf"
|
echo "Config file installed as ${PREFIX}/etc/shorewall/shorewall.conf"
|
||||||
|
@ -257,10 +257,18 @@ fi
|
|||||||
run_install $OWNERSHIP -m 0644 shorewall6.conf ${PREFIX}/usr/share/shorewall6/configfiles/shorewall6.conf
|
run_install $OWNERSHIP -m 0644 shorewall6.conf ${PREFIX}/usr/share/shorewall6/configfiles/shorewall6.conf
|
||||||
|
|
||||||
perl -p -w -i -e 's|^CONFIG_PATH=.*|CONFIG_PATH=/usr/share/shorewall6/configfiles:/usr/share/shorewall6|;' ${PREFIX}/usr/share/shorewall6/configfiles/shorewall6.conf
|
perl -p -w -i -e 's|^CONFIG_PATH=.*|CONFIG_PATH=/usr/share/shorewall6/configfiles:/usr/share/shorewall6|;' ${PREFIX}/usr/share/shorewall6/configfiles/shorewall6.conf
|
||||||
perl -p -w -i -e 's|^STARTUP_LOG=.*|STARTUP_LOG=/var/log/shorewall6-lite-init.log|;' ${PREFIX}/usr/share/shorewall/configfiles/shorewall.conf
|
perl -p -w -i -e 's|^STARTUP_LOG=.*|STARTUP_LOG=/var/log/shorewall6-lite-init.log|;' ${PREFIX}/usr/share/shorewall6/configfiles/shorewall6.conf
|
||||||
|
|
||||||
if [ ! -f ${PREFIX}/etc/shorewall6/shorewall6.conf ]; then
|
if [ ! -f ${PREFIX}/etc/shorewall6/shorewall6.conf ]; then
|
||||||
run_install $OWNERSHIP -m 0644 shorewall6.conf ${PREFIX}/etc/shorewall6/shorewall6.conf
|
run_install $OWNERSHIP -m 0644 shorewall6.conf ${PREFIX}/etc/shorewall6/shorewall6.conf
|
||||||
|
|
||||||
|
if [ -n "$DEBIAN" ] && mywhich perl; then
|
||||||
|
#
|
||||||
|
# Make a Debian-like shorewall6.conf
|
||||||
|
#
|
||||||
|
perl -p -w -i -e 's|^STARTUP_ENABLED=.*|STARTUP_ENABLED=Yes|;' ${PREFIX}/etc/shorewall6/shorewall6.conf
|
||||||
|
fi
|
||||||
|
|
||||||
echo "Config file installed as ${PREFIX}/etc/shorewall6/shorewall6.conf"
|
echo "Config file installed as ${PREFIX}/etc/shorewall6/shorewall6.conf"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user