diff options
| author | Roger Gonzalez <roger@rogs.me> | 2023-10-21 15:21:07 -0300 |
|---|---|---|
| committer | Roger Gonzalez <roger@rogs.me> | 2023-10-21 15:21:07 -0300 |
| commit | 36f45d690f5d187fb51cc99970893d44be9218ba (patch) | |
| tree | 81be9ae067e2ca0c5f9df7f39d5dd9733f38b090 | |
| parent | 067bc21560117ef0c845467c159850db6034393d (diff) | |
| parent | dfdaaa2562f6b7d78b8bae198f43244e147f8668 (diff) | |
Merge branch 'master' of gitlab.com:rogs/yams into feature/refactor-to-literate
| -rw-r--r-- | docker-compose.example.yaml | 1 | ||||
| -rwxr-xr-x | install.sh | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/docker-compose.example.yaml b/docker-compose.example.yaml index 0f2c82a..5605e37 100644 --- a/docker-compose.example.yaml +++ b/docker-compose.example.yaml @@ -148,7 +148,6 @@ services: - VPN_TYPE=openvpn - OPENVPN_USER=<vpn_user> - OPENVPN_PASSWORD=<vpn_password> - - SERVER_COUNTRIES=<vpn_country> - OPENVPN_CIPHERS=AES-256-GCM restart: unless-stopped @@ -168,11 +168,6 @@ if [ "$setup_vpn" == "y" ]; then fi done echo - - echo "What country do you want to use?" - echo "If you are using: NordVPN, Perfect Privacy, Private Internet Access, VyprVPN, WeVPN or Windscribe, then input a region" - read -p "You can check the countries/regions list for your VPN here: https://github.com/qdm12/gluetun/wiki/$vpn_service#servers [brazil]: " vpn_country - vpn_country=${vpn_country:-"brazil"} fi echo "Configuring the docker-compose file for the user \"$username\" on \"$install_location\"..." @@ -204,15 +199,11 @@ sed -i -e "s;<install_location>;$install_location;g" "$filename" if [ "$setup_vpn" == "y" ]; then sed -i -e "s;<vpn_service>;$vpn_service;g" "$filename" sed -i -e "s;<vpn_user>;$vpn_user;g" "$filename" - sed -i -e "s;<vpn_country>;$vpn_country;g" "$filename" sed -i -e "s;<vpn_password>;$vpn_password;g" "$filename" sed -i -e "s;#network_mode: \"service:gluetun\";network_mode: \"service:gluetun\";g" "$filename" sed -i -e "s;ports: # qbittorrent;#port: # qbittorrent;g" "$filename" sed -i -e "s;- 8080:8080 # qbittorrent;#- 8080:8080 # qbittorrent;g" "$filename" sed -i -e "s;#- 8080:8080/tcp # gluetun;- 8080:8080/tcp # gluetun;g" "$filename" - if echo "nordvpn perfect privacy private internet access vyprvpn wevpn windscribe" | grep -qw "$vpn_service"; then - sed -i -e "s;SERVER_COUNTRIES;SERVER_REGIONS;g" "$filename" - fi fi sed -i -e "s;<filename>;$filename;g" yams |