Move port forwarding scripts into provider folders, unify call and fix export syntax of environment variables

This commit is contained in:
Kristian Haugene
2020-08-22 15:24:12 +02:00
parent f8fa45e386
commit f5a305bb8e
5 changed files with 6 additions and 18 deletions

View File

@@ -37,7 +37,7 @@ for env_var in os.environ:
with open(args.env_var_script_file, 'w') as script_file:
for var_name, var_value in variables_to_persist.items():
script_file.write(
'export {env_var} = {env_var_value}\n'.format(
'export {env_var}={env_var_value}\n'.format(
env_var=var_name,
env_var_value=var_value,
),

View File

@@ -1,8 +1,5 @@
#!/bin/bash
# Fail script on errors
set -e
# Source our persisted env variables from container startup
. /etc/transmission/environment-variables.sh
@@ -72,20 +69,11 @@ fi
echo "STARTING TRANSMISSION"
exec su --preserve-environment ${RUN_AS} -s /bin/bash -c "/usr/bin/transmission-daemon -g ${TRANSMISSION_HOME} --logfile $LOGFILE" &
if [[ "${OPENVPN_PROVIDER^^}" = "PIA" ]]
then
echo "CONFIGURING PORT FORWARDING"
exec /etc/transmission/updatePort.sh &
elif [[ "${OPENVPN_PROVIDER^^}" = "PERFECTPRIVACY" ]]
then
echo "CONFIGURING PORT FORWARDING"
exec /etc/transmission/updatePPPort.sh ${TRANSMISSION_BIND_ADDRESS_IPV4} &
elif [[ "${OPENVPN_PROVIDER^^}" = "PRIVATEVPN" ]]
then
echo "CONFIGURING PORT FORWARDING"
exec /etc/transmission/updatePrivateVPNPort.sh &
else
echo "NO PORT UPDATER FOR THIS PROVIDER"
# Configure port forwarding if applicable
if [[ -x /etc/openvpn/${OPENVPN_PROVIDER,,}/update-port.sh && -z $DISABLE_PORT_UPDATER ]]; then
echo "Provider ${OPENVPN_PROVIDER^^} has a script for automatic port forwarding. Will run it now."
echo "If you want to disable this, set environment variable DISABLE_PORT_UPDATER=yes"
exec /etc/openvpn/${OPENVPN_PROVIDER,,}/update-port.sh &
fi
# If transmission-post-start.sh exists, run it