diff --git a/openvpn/start.sh b/openvpn/start.sh index a9e7a2ef3..61c1704d2 100755 --- a/openvpn/start.sh +++ b/openvpn/start.sh @@ -64,6 +64,11 @@ if [ "true" = "$ENABLE_UFW" ]; then echo "allowing $PEER_PORT through the firewall" ufw allow $PEER_PORT + if [ "true" = "$WEBPROXY_ENABLED" ]; then + echo "allowing $WEBPROXY_PORT through the firewall" + ufw allow $WEBPROXY_PORT + fi + eval $(/sbin/ip r l m 0.0.0.0 | awk '{if($5!="tun0"){print "GW="$3"\nINT="$5; exit}}') echo "allowing access to $TRANSMISSION_RPC_PORT from $GW" ufw allow proto tcp from $GW to any port $TRANSMISSION_RPC_PORT diff --git a/openvpn/tunnelUp.sh b/openvpn/tunnelUp.sh index 5b238ddc2..9612c65ae 100755 --- a/openvpn/tunnelUp.sh +++ b/openvpn/tunnelUp.sh @@ -1,4 +1,4 @@ #!/bin/sh -/etc/transmission/start.sh +/etc/transmission/start.sh "$@" /opt/tinyproxy/start.sh diff --git a/tinyproxy/start.sh b/tinyproxy/start.sh index 18156e391..e6546d3eb 100755 --- a/tinyproxy/start.sh +++ b/tinyproxy/start.sh @@ -4,7 +4,6 @@ . /etc/transmission/environment-variables.sh PROXY_CONF='/etc/tinyproxy.conf' -DEFAULT_PORT=8888 set_port() { @@ -33,12 +32,10 @@ if [ "${WEBPROXY_ENABLED}" = "true" ]; then echo "STARTING TINYPROXY" - if [ -z "$WEBPROXY_PORT" ] ; then - set_port ${WEBPROXY_PORT} ${PROXY_CONF} - else - # Always default back to port 8888 - set_port ${DEFAULT_PORT} ${PROXY_CONF} - fi + set_port ${WEBPROXY_PORT} ${PROXY_CONF} + + # Allow all clients + sed -i -e"s/^Allow /#Allow /" ${PROXY_CONF} /etc/init.d/tinyproxy start echo "Tinyproxy startup script complete."