From a01aa0dd75f2aa6e01ec27ec2dc8bb315dcd3330 Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sleede.com>
Date: Tue, 2 Mar 2021 09:37:34 +0100
Subject: [PATCH] [bug] unable to install a new instance with an external
 reverse proxy

---
 CHANGELOG.md   |  3 +++
 setup/setup.sh | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ebe372e3..891c32848 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog Fab-manager
 
+- Improved the setup script
+- Fix a bug: unable to install a new instance with an external reverse proxy
+
 ## v4.7.2 2021 March 1st
 - Updated yq to v4
 - Fix a bug: unable to upgrade using the easy upgrade command
diff --git a/setup/setup.sh b/setup/setup.sh
index 756f511dc..e5fd65074 100755
--- a/setup/setup.sh
+++ b/setup/setup.sh
@@ -165,12 +165,23 @@ prepare_nginx()
     if [ "$confirm" != "n" ]; then
       echo "Adding a network configuration to the docker-compose.yml file..."
       yq -i eval '.networks.web.external = "true"' docker-compose.yml
-      yq -i eval '.networks.db = ""' docker-compose.yml
+      yq -i eval '.networks.db = null' docker-compose.yml
       yq -i eval '.services.fabmanager.networks += ["web"]' docker-compose.yml
       yq -i eval '.services.fabmanager.networks += ["db"]' docker-compose.yml
       yq -i eval '.services.postgres.networks += ["db"]' docker-compose.yml
       yq -i eval '.services.redis.networks += ["db"]' docker-compose.yml
     fi
+    read -rp "Do you want to rename the Fab-manager's service? (Y/n) " confirm </dev/tty
+    if [ "$confirm" != "n" ]; then
+      current="$(yq eval '.services.*.image | select(. == "sleede/fab-manager*") | path | .[-2]' docker-compose.yml)"
+      printf "=======================\n- \e[1mCurrent value: %s\e[21m\n- New value? (leave empty to keep the current value)\n" "$current"
+      read -rp "  > " value </dev/tty
+      echo "======================="
+      if [ "$value" != "" ]; then
+        escaped=$(printf '%s\n' "$value" | iconv -f utf8 -t ascii//TRANSLIT//IGNORE | sed -e 's/[^a-zA-Z0-9-]/_/g')
+        yq -i eval ".services.$escaped = .services.$current | del(.services.$current)" docker-compose.yml
+      fi
+    fi
   fi
 }
 
@@ -245,7 +256,7 @@ configure_env_file()
     printf "\n\n\n==== \e[4m%s\e[24m ====\n" "$variable"
     printf "**** \e[1mDocumentation:\e[21m ****\n"
     echo "$var_doc"
-    printf "=======================\n- \e[1mCurrent value: %s\e[21m\n- New value? (leave empty to keep current value)\n" "$current"
+    printf "=======================\n- \e[1mCurrent value: %s\e[21m\n- New value? (leave empty to keep the current value)\n" "$current"
     read -rp "  > " value </dev/tty
     echo "======================="
     if [ "$value" != "" ]; then