Now disable ufw at tunnel down after deluge kill and re-enable it at tunnel up

This commit is contained in:
Eldwan Brianne
2021-03-17 10:27:53 +01:00
parent 0376af5593
commit fc974ff463
4 changed files with 14 additions and 6 deletions

View File

@@ -69,7 +69,15 @@ if [[ -n "${LOCAL_NETWORK-}" ]]; then
fi
fi
ufw status
# check if ufw is disabled (re-enable it)
if [[ "${ENABLE_UFW,,}" == "true" ]]; then
ufw status | grep -qw active
if [[ "$?" != "0" ]]; then
log "Re-enabling ufw"
ufw enable
ufw status
fi
fi
log "Starting Deluge"
exec su --preserve-environment abc -s /bin/bash -c "/usr/bin/deluged -d -c /config -L info -l /config/deluged.log" &

View File

@@ -14,7 +14,7 @@ then
fi
log "Sending kill signal to deluge-daemon"
PID=$(pidof deluged)
PID=$(pidof /usr/bin/python3 /usr/bin/deluged)
kill -9 $PID
# Give deluge-daemon time to shut down
for i in {1..10}; do
@@ -29,3 +29,5 @@ then
/config/deluge-post-stop.sh "$@"
log "/config/deluge-post-stop.sh returned $?"
fi
exec /etc/ufw/disable.sh

View File

@@ -200,7 +200,7 @@ if [[ "true" = "${ENABLE_UFW}" ]]; then
/etc/ufw/enable.sh tun0 ${CHOSEN_OPENVPN_CONFIG}
fi
DELUGE_CONTROL_OPTS="--script-security 2 --up-delay --up /etc/openvpn/tunnelUp.sh --down /etc/openvpn/tunnelDown.sh"
DELUGE_CONTROL_OPTS="--script-security 2 --auth-nocache --up-delay --up /etc/openvpn/tunnelUp.sh --down /etc/openvpn/tunnelDown.sh"
# shellcheck disable=SC2086
log "Starting openvpn"

4
root/etc/ufw/disable.sh Normal file → Executable file
View File

@@ -6,9 +6,7 @@ TIMESTAMP_FORMAT='%a %b %d %T %Y'
log() {
echo "$(date +"${TIMESTAMP_FORMAT}") [ufw-disable] $*"
}
# Source our persisted env variables from container startup
. /etc/deluge/environment-variables.sh
ufw reset
log "Disabling ufw"
ufw disable
ufw status