bea/docker-deluge-openvpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/illegalprime/docker-transmission-openvpn into illegalprime-master

Browse Source 
Conflicts:
	Dockerfile
This commit is contained in:
Kristian Haugene
2017-10-13 20:18:41 +02:00
parent 15920bd4ae 644a8b3325
commit 8e72c504e5
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
transmission/updatePort.sh
View File

@@ -4,11 +4,8 @@
. /etc/transmission/environment-variables.sh . /etc/transmission/environment-variables.sh
# Settings # Settings
PIA_PASSWD_FILE=/config/openvpn-credentials.txt
TRANSMISSION_PASSWD_FILE=/config/transmission-credentials.txt TRANSMISSION_PASSWD_FILE=/config/transmission-credentials.txt
pia_username=$(head -1 $PIA_PASSWD_FILE)
pia_passwd=$(tail -1 $PIA_PASSWD_FILE)
transmission_username=$(head -1 $TRANSMISSION_PASSWD_FILE) transmission_username=$(head -1 $TRANSMISSION_PASSWD_FILE)
transmission_passwd=$(tail -1 $TRANSMISSION_PASSWD_FILE) transmission_passwd=$(tail -1 $TRANSMISSION_PASSWD_FILE)
pia_client_id_file=/etc/transmission/pia_client_id pia_client_id_file=/etc/transmission/pia_client_id
@@ -19,21 +16,21 @@ transmission_settings_file=${TRANSMISSION_HOME}/settings.json
# #
new_client_id() { new_client_id() {
head -n 100 /dev/urandom | md5sum | tr -d " -" | tee $pia_client_id_file head -n 100 /dev/urandom | sha256sum | tr -d " -" | tee $pia_client_id_file
} }
pia_client_id="$(cat $pia_client_id_file 2>/dev/null)" pia_client_id="$(cat $pia_client_id_file 2>/dev/null)"
if [ -z ${pia_client_id} ]; then if [ -z "${pia_client_id}" ]; then
echo "Generating new client id for PIA" echo "Generating new client id for PIA"
pia_client_id=$(new_client_id) pia_client_id=$(new_client_id)
fi fi
# Get the port # Get the port
port_assignment_url="http://209.222.18.222:2000/?client_id=$pia_client_id" port_assignment_url="http://209.222.18.222:2000/?client_id=$pia_client_id"
pia_response=$(curl -s -f $port_assignment_url) pia_response=$(curl -s -f "$port_assignment_url")
pia_curl_exit_code=$? pia_curl_exit_code=$?
if [ -z $pia_response ]; then if [ -z "$pia_response" ]; then
echo "Port forwarding is already activated on this connection, has expired, or you are not connected to a PIA region that supports port forwarding" echo "Port forwarding is already activated on this connection, has expired, or you are not connected to a PIA region that supports port forwarding"
fi fi
@@ -44,14 +41,14 @@ if [ $pia_curl_exit_code -ne 0 ]; then
fi fi
# Check for errors in PIA response # Check for errors in PIA response
error=$(echo $pia_response | grep -oE "\"error\".*\"") error=$(echo "$pia_response" | grep -oE "\"error\".*\"")
if [ ! -z "$error" ]; then if [ ! -z "$error" ]; then
echo "PIA returned an error: $error" echo "PIA returned an error: $error"
exit exit
fi fi
# Get new port, check if empty # Get new port, check if empty
new_port=$(echo $pia_response | grep -oE "[0-9]+") new_port=$(echo "$pia_response" | grep -oE "[0-9]+")
if [ -z "$new_port" ]; then if [ -z "$new_port" ]; then
echo "Could not find new port from PIA" echo "Could not find new port from PIA"
exit exit
@@ -63,7 +60,8 @@ echo "Got new port $new_port from PIA"
# #
# Check if transmission remote is set up with authentication # Check if transmission remote is set up with authentication
auth_enabled=$(grep 'rpc-authentication-required\"' $transmission_settings_file | grep -oE 'true|false') auth_enabled=$(grep 'rpc-authentication-required\"' "$transmission_settings_file" \
| grep -oE 'true|false')
if [ "true" = "$auth_enabled" ] if [ "true" = "$auth_enabled" ]
then then
echo "transmission auth required" echo "transmission auth required"
@@ -79,11 +77,11 @@ if [ "$new_port" != "$transmission_peer_port" ]; then
if [ "true" = "$ENABLE_UFW" ]; then if [ "true" = "$ENABLE_UFW" ]; then
echo "Update UFW rules before changing port in Transmission" echo "Update UFW rules before changing port in Transmission"
echo "denying access to $TRANSMISSION_PEER_PORT" echo "denying access to $transmission_peer_port"
ufw deny $TRANSMISSION_PEER_PORT ufw deny "$transmission_peer_port"
echo "allowing $new_port through the firewall" echo "allowing $new_port through the firewall"
ufw allow $new_port ufw allow "$new_port"
fi fi
transmission-remote $myauth -p "$new_port" transmission-remote $myauth -p "$new_port"