From 927d1b34ec399700e8bbcec3884e9e8c4c72e1b4 Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Sun, 15 Jan 2023 20:17:44 -0300 Subject: Testing VPN in install.sh --- docker-compose.example.yaml | 7 ++++--- install.sh | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/docker-compose.example.yaml b/docker-compose.example.yaml index 966e56a..b7e20a9 100644 --- a/docker-compose.example.yaml +++ b/docker-compose.example.yaml @@ -28,9 +28,8 @@ services: - /downloads:/downloads - /config/qbittorrent:/config restart: unless-stopped - network_mode: "service:gluetun" - depends_on: - - gluetun + #port: 8080:8080 + #network_mode: "service:gluetun" # Sonarr is used to query, add downloads to the download queue and index TV shows sonarr: @@ -97,6 +96,7 @@ services: gluetun: image: qmcgaw/gluetun container_name: gluetun + profiles: donotstart cap_add: - NET_ADMIN devices: @@ -112,3 +112,4 @@ services: - VPN_SERVICE_PROVIDER=mullvad - VPN_TYPE=openvpn - OPENVPN_USER= + - SERVER_COUNTRIES= diff --git a/install.sh b/install.sh index a991545..6ad6942 100755 --- a/install.sh +++ b/install.sh @@ -109,6 +109,20 @@ if [ $media_folder_correct == "n" ]; then send_error_message "Media folder is not correct. Please, fix it and run the script again" fi +# Adding the VPN +echo "Time to setup the VPN." +echo "The automatic installer only works with Mullvad, but you can setup many other VPNs manually." +echo "If you want to use any other VPN, choose \"N\"" +read -p "Do you want to configure Mullvad VPN? [Y/n]: " setup_vpn +setup_vpn=${setup_vpn:-"y"} + +if [ $setup_vpn == "y" ]; then + read -p "What's your Mullvad username? (without spaces): " mullvad_user + echo "What country do you want to use?" + read -p "You can check the countries list here: https://mullvad.net/en/servers/ [brazil]: " mullvad_country + mullvad_country=${mullvad_country:-"brazil"} +fi + echo "Configuring the docker-compose file for the user \"$username\" on \"$install_location\"..." # ============================================================================================ @@ -134,6 +148,14 @@ sed -i -e "s;;$media_folder;g" $filename # Set config folder sed -i -e "s;;$install_location;g" $filename +# Set VPN +if [ $setup_vpn == "y" ]; then + sed -i -e "s;;$mullvad_user;g" $filename + sed -i -e "s;;$mullvad_country;g" $filename + sed -i -e "s;#network_mode: \"service:gluetun\";network_mode: \"service:gluetun\";g" $filename + sed -i -e "s;port: 8080:8080;#port: 8080:8080;g" $filename +fi + # Set yams script sed -i -e "s;;$filename;g" yams sed -i -e "s;;$install_location;g" yams -- cgit v1.2.3