From 30b6dd846479070b83ba6743281cfdc0e7f8bf88 Mon Sep 17 00:00:00 2001
From: Roger Gonzalez <roger@rogs.me>
Date: Sun, 12 Nov 2023 10:29:49 -0300
Subject: [PATCH] Moved VPN enabled to outside of the VPN config

---
 docs.org   | 4 ++--
 install.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs.org b/docs.org
index 9259f63..d79521c 100644
--- a/docs.org
+++ b/docs.org
@@ -384,13 +384,13 @@ if [ "$media_service" == "plex" ]; then
      -e "s|- 8096:8096 # plex|#- 8096:8096 # plex|g" "$filename"
 fi
 
-sed -i -e "s|<install_directory>|$install_directory|g" "$env_file"
+sed -i -e "s|<install_directory>|$install_directory|g" "$env_file" \
+ -e "s|<vpn_enabled>|$setup_vpn|g" "$env_file" \
 
 if [ "$setup_vpn" == "y" ]; then
     sed -i -e "s|<vpn_service>|$vpn_service|g" "$env_file" \
      -e "s|<vpn_user>|$vpn_user|g" "$env_file" \
      -e "s|<vpn_password>|$vpn_password|g" "$env_file" \
-     -e "s|<vpn_enabled>|$setup_vpn|g" "$env_file" \
      -e "s|#network_mode: \"service:gluetun\"|network_mode: \"service:gluetun\"|g" "$filename" \
      -e "s|ports: # qbittorrent|#ports: # qbittorrent|g" "$filename" \
      -e "s|- 8080:8080 # qbittorrent|#- 8080:8080 # qbittorrent|g" "$filename" \
diff --git a/install.sh b/install.sh
index 7851c07..921373b 100644
--- a/install.sh
+++ b/install.sh
@@ -227,13 +227,13 @@ if [ "$media_service" == "plex" ]; then
      -e "s|- 8096:8096 # plex|#- 8096:8096 # plex|g" "$filename"
 fi
 
-sed -i -e "s|<install_directory>|$install_directory|g" "$env_file"
+sed -i -e "s|<install_directory>|$install_directory|g" "$env_file" \
+ -e "s|<vpn_enabled>|$setup_vpn|g" "$env_file" \
 
 if [ "$setup_vpn" == "y" ]; then
     sed -i -e "s|<vpn_service>|$vpn_service|g" "$env_file" \
      -e "s|<vpn_user>|$vpn_user|g" "$env_file" \
      -e "s|<vpn_password>|$vpn_password|g" "$env_file" \
-     -e "s|<vpn_enabled>|$setup_vpn|g" "$env_file" \
      -e "s|#network_mode: \"service:gluetun\"|network_mode: \"service:gluetun\"|g" "$filename" \
      -e "s|ports: # qbittorrent|#ports: # qbittorrent|g" "$filename" \
      -e "s|- 8080:8080 # qbittorrent|#- 8080:8080 # qbittorrent|g" "$filename" \