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

Updated port forward script for PIA.

Browse Source
This commit is contained in:
Michael Eden
2017-09-13 10:40:55 -04:00
parent 9b9492f14b
commit 644a8b3325
2 changed files with 87 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
Dockerfile
View File

@@ -28,82 +28,82 @@ RUN apt-get update \
ADD openvpn/ /etc/openvpn/ ADD openvpn/ /etc/openvpn/
ADD transmission/ /etc/transmission/ ADD transmission/ /etc/transmission/
ENV OPENVPN_USERNAME=**None** \ ENV OPENVPN_USERNAME="**None**" \
OPENVPN_PASSWORD=**None** \ OPENVPN_PASSWORD="**None**" \
OPENVPN_PROVIDER=**None** \ OPENVPN_PROVIDER="**None**" \
"TRANSMISSION_ALT_SPEED_DOWN=50" \ TRANSMISSION_ALT_SPEED_DOWN="50" \
"TRANSMISSION_ALT_SPEED_ENABLED=false" \ TRANSMISSION_ALT_SPEED_ENABLED="false" \
"TRANSMISSION_ALT_SPEED_TIME_BEGIN=540" \ TRANSMISSION_ALT_SPEED_TIME_BEGIN="540" \
"TRANSMISSION_ALT_SPEED_TIME_DAY=127" \ TRANSMISSION_ALT_SPEED_TIME_DAY="127" \
"TRANSMISSION_ALT_SPEED_TIME_ENABLED=false" \ TRANSMISSION_ALT_SPEED_TIME_ENABLED="false" \
"TRANSMISSION_ALT_SPEED_TIME_END=1020" \ TRANSMISSION_ALT_SPEED_TIME_END="1020" \
"TRANSMISSION_ALT_SPEED_UP=50" \ TRANSMISSION_ALT_SPEED_UP="50" \
"TRANSMISSION_BIND_ADDRESS_IPV4=0.0.0.0" \ TRANSMISSION_BIND_ADDRESS_IPV4="0.0.0.0" \
"TRANSMISSION_BIND_ADDRESS_IPV6=::" \ TRANSMISSION_BIND_ADDRESS_IPV6="::" \
"TRANSMISSION_BLOCKLIST_ENABLED=false" \ TRANSMISSION_BLOCKLIST_ENABLED="false" \
"TRANSMISSION_BLOCKLIST_URL=http://www.example.com/blocklist" \ TRANSMISSION_BLOCKLIST_URL="http://www.example.com/blocklist" \
"TRANSMISSION_CACHE_SIZE_MB=4" \ TRANSMISSION_CACHE_SIZE_MB="4" \
"TRANSMISSION_DHT_ENABLED=true" \ TRANSMISSION_DHT_ENABLED="true" \
"TRANSMISSION_DOWNLOAD_DIR=/data/completed" \ TRANSMISSION_DOWNLOAD_DIR="/data/completed" \
"TRANSMISSION_DOWNLOAD_LIMIT=100" \ TRANSMISSION_DOWNLOAD_LIMIT="100" \
"TRANSMISSION_DOWNLOAD_LIMIT_ENABLED=0" \ TRANSMISSION_DOWNLOAD_LIMIT_ENABLED="0" \
"TRANSMISSION_DOWNLOAD_QUEUE_ENABLED=true" \ TRANSMISSION_DOWNLOAD_QUEUE_ENABLED="true" \
"TRANSMISSION_DOWNLOAD_QUEUE_SIZE=5" \ TRANSMISSION_DOWNLOAD_QUEUE_SIZE="5" \
"TRANSMISSION_ENCRYPTION=1" \ TRANSMISSION_ENCRYPTION="1" \
"TRANSMISSION_IDLE_SEEDING_LIMIT=30" \ TRANSMISSION_IDLE_SEEDING_LIMIT="30" \
"TRANSMISSION_IDLE_SEEDING_LIMIT_ENABLED=false" \ TRANSMISSION_IDLE_SEEDING_LIMIT_ENABLED="false" \
"TRANSMISSION_INCOMPLETE_DIR=/data/incomplete" \ TRANSMISSION_INCOMPLETE_DIR="/data/incomplete" \
"TRANSMISSION_INCOMPLETE_DIR_ENABLED=true" \ TRANSMISSION_INCOMPLETE_DIR_ENABLED="true" \
"TRANSMISSION_LPD_ENABLED=false" \ TRANSMISSION_LPD_ENABLED="false" \
"TRANSMISSION_MAX_PEERS_GLOBAL=200" \ TRANSMISSION_MAX_PEERS_GLOBAL="200" \
"TRANSMISSION_MESSAGE_LEVEL=2" \ TRANSMISSION_MESSAGE_LEVEL="2" \
"TRANSMISSION_PEER_CONGESTION_ALGORITHM=" \ TRANSMISSION_PEER_CONGESTION_ALGORITHM="" \
"TRANSMISSION_PEER_ID_TTL_HOURS=6" \ TRANSMISSION_PEER_ID_TTL_HOURS="6" \
"TRANSMISSION_PEER_LIMIT_GLOBAL=200" \ TRANSMISSION_PEER_LIMIT_GLOBAL="200" \
"TRANSMISSION_PEER_LIMIT_PER_TORRENT=50" \ TRANSMISSION_PEER_LIMIT_PER_TORRENT="50" \
"TRANSMISSION_PEER_PORT=51413" \ TRANSMISSION_PEER_PORT="51413" \
"TRANSMISSION_PEER_PORT_RANDOM_HIGH=65535" \ TRANSMISSION_PEER_PORT_RANDOM_HIGH="65535" \
"TRANSMISSION_PEER_PORT_RANDOM_LOW=49152" \ TRANSMISSION_PEER_PORT_RANDOM_LOW="49152" \
"TRANSMISSION_PEER_PORT_RANDOM_ON_START=false" \ TRANSMISSION_PEER_PORT_RANDOM_ON_START="false" \
"TRANSMISSION_PEER_SOCKET_TOS=default" \ TRANSMISSION_PEER_SOCKET_TOS="default" \
"TRANSMISSION_PEX_ENABLED=true" \ TRANSMISSION_PEX_ENABLED="true" \
"TRANSMISSION_PORT_FORWARDING_ENABLED=false" \ TRANSMISSION_PORT_FORWARDING_ENABLED="false" \
"TRANSMISSION_PREALLOCATION=1" \ TRANSMISSION_PREALLOCATION="1" \
"TRANSMISSION_PREFETCH_ENABLED=1" \ TRANSMISSION_PREFETCH_ENABLED="1" \
"TRANSMISSION_QUEUE_STALLED_ENABLED=true" \ TRANSMISSION_QUEUE_STALLED_ENABLED="true" \
"TRANSMISSION_QUEUE_STALLED_MINUTES=30" \ TRANSMISSION_QUEUE_STALLED_MINUTES="30" \
"TRANSMISSION_RATIO_LIMIT=2" \ TRANSMISSION_RATIO_LIMIT="2" \
"TRANSMISSION_RATIO_LIMIT_ENABLED=false" \ TRANSMISSION_RATIO_LIMIT_ENABLED="false" \
"TRANSMISSION_RENAME_PARTIAL_FILES=true" \ TRANSMISSION_RENAME_PARTIAL_FILES="true" \
"TRANSMISSION_RPC_AUTHENTICATION_REQUIRED=false" \ TRANSMISSION_RPC_AUTHENTICATION_REQUIRED="false" \
"TRANSMISSION_RPC_BIND_ADDRESS=0.0.0.0" \ TRANSMISSION_RPC_BIND_ADDRESS="0.0.0.0" \
"TRANSMISSION_RPC_ENABLED=true" \ TRANSMISSION_RPC_ENABLED="true" \
"TRANSMISSION_RPC_PASSWORD=password" \ TRANSMISSION_RPC_PASSWORD="password" \
"TRANSMISSION_RPC_PORT=9091" \ TRANSMISSION_RPC_PORT="9091" \
"TRANSMISSION_RPC_URL=/transmission/" \ TRANSMISSION_RPC_URL="/transmission/" \
"TRANSMISSION_RPC_USERNAME=username" \ TRANSMISSION_RPC_USERNAME="username" \
"TRANSMISSION_RPC_WHITELIST=127.0.0.1" \ TRANSMISSION_RPC_WHITELIST="127.0.0.1" \
"TRANSMISSION_RPC_WHITELIST_ENABLED=false" \ TRANSMISSION_RPC_WHITELIST_ENABLED="false" \
"TRANSMISSION_SCRAPE_PAUSED_TORRENTS_ENABLED=true" \ TRANSMISSION_SCRAPE_PAUSED_TORRENTS_ENABLED="true" \
"TRANSMISSION_SCRIPT_TORRENT_DONE_ENABLED=false" \ TRANSMISSION_SCRIPT_TORRENT_DONE_ENABLED="false" \
"TRANSMISSION_SCRIPT_TORRENT_DONE_FILENAME=" \ TRANSMISSION_SCRIPT_TORRENT_DONE_FILENAME="" \
"TRANSMISSION_SEED_QUEUE_ENABLED=false" \ TRANSMISSION_SEED_QUEUE_ENABLED="false" \
"TRANSMISSION_SEED_QUEUE_SIZE=10" \ TRANSMISSION_SEED_QUEUE_SIZE="10" \
"TRANSMISSION_SPEED_LIMIT_DOWN=100" \ TRANSMISSION_SPEED_LIMIT_DOWN="100" \
"TRANSMISSION_SPEED_LIMIT_DOWN_ENABLED=false" \ TRANSMISSION_SPEED_LIMIT_DOWN_ENABLED="false" \
"TRANSMISSION_SPEED_LIMIT_UP=100" \ TRANSMISSION_SPEED_LIMIT_UP="100" \
"TRANSMISSION_SPEED_LIMIT_UP_ENABLED=false" \ TRANSMISSION_SPEED_LIMIT_UP_ENABLED="false" \
"TRANSMISSION_START_ADDED_TORRENTS=true" \ TRANSMISSION_START_ADDED_TORRENTS="true" \
"TRANSMISSION_TRASH_ORIGINAL_TORRENT_FILES=false" \ TRANSMISSION_TRASH_ORIGINAL_TORRENT_FILES="false" \
"TRANSMISSION_UMASK=2" \ TRANSMISSION_UMASK="2" \
"TRANSMISSION_UPLOAD_LIMIT=100" \ TRANSMISSION_UPLOAD_LIMIT="100" \
"TRANSMISSION_UPLOAD_LIMIT_ENABLED=0" \ TRANSMISSION_UPLOAD_LIMIT_ENABLED="0" \
"TRANSMISSION_UPLOAD_SLOTS_PER_TORRENT=14" \ TRANSMISSION_UPLOAD_SLOTS_PER_TORRENT="14" \
"TRANSMISSION_UTP_ENABLED=true" \ TRANSMISSION_UTP_ENABLED="true" \
"TRANSMISSION_WATCH_DIR=/data/watch" \ TRANSMISSION_WATCH_DIR="/data/watch" \
"TRANSMISSION_WATCH_DIR_ENABLED=true" \ TRANSMISSION_WATCH_DIR_ENABLED="true" \
"TRANSMISSION_HOME=/data/transmission-home" \ TRANSMISSION_HOME="/data/transmission-home" \
"ENABLE_UFW=false" \ ENABLE_UFW="false" \
PUID=\ PUID=\
PGID= PGID=

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"