From e9be2a7fb7a48e565263597c988ce6f214972b04 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Tue, 16 Jan 2018 14:40:05 -0800
Subject: [PATCH] Remove is_custom_domain use (use adminFqdn instead)

---
 setup/argparser.sh | 7 +------
 setup/start.sh     | 9 +--------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/setup/argparser.sh b/setup/argparser.sh
index ffad4a444..3724f2e7e 100644
--- a/setup/argparser.sh
+++ b/setup/argparser.sh
@@ -9,7 +9,6 @@ arg_fqdn=""
 arg_admin_location=""
 arg_admin_fqdn=""
 arg_zone_name=""
-arg_is_custom_domain="false" # can be removed after 1.9
 arg_retire_reason=""
 arg_retire_info=""
 arg_version=""
@@ -37,10 +36,6 @@ while true; do
         arg_zone_name=$(echo "$2" | $json zoneName)
         [[ "${arg_zone_name}" == "" ]] && arg_zone_name="${arg_fqdn}"
 
-        # can be removed after 1.9
-        arg_is_custom_domain=$(echo "$2" | $json isCustomDomain)
-        [[ "${arg_is_custom_domain}" == "" ]] && arg_is_custom_domain="true"
-
         arg_admin_location=$(echo "$2" | $json adminLocation)
         [[ "${arg_admin_location}" == "" ]] && arg_admin_location="my"
 
@@ -69,8 +64,8 @@ done
 
 echo "Parsed arguments:"
 echo "api server: ${arg_api_server_origin}"
+echo "admin fqdn: ${arg_admin_fqdn}"
 echo "fqdn: ${arg_fqdn}"
-echo "custom domain: ${arg_is_custom_domain}"
 echo "version: ${arg_version}"
 echo "web server: ${arg_web_server_origin}"
 echo "provider: ${arg_provider}"
diff --git a/setup/start.sh b/setup/start.sh
index 4ccd5c70d..344215b30 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -206,13 +206,6 @@ cd "${BOX_SRC_DIR}"
 BOX_ENV=cloudron DATABASE_URL=mysql://root:${mysql_root_password}@127.0.0.1/box "${BOX_SRC_DIR}/node_modules/.bin/db-migrate" up
 EOF
 
-if [[ -z "${arg_admin_fqdn:-}" ]]; then
-    # can be removed after 1.9
-    admin_fqdn=$([[ "${arg_is_custom_domain}" == "true" ]] && echo "${arg_admin_location}.${arg_fqdn}" ||  echo "${arg_admin_location}-${arg_fqdn}")
-else
-    admin_fqdn="${arg_admin_fqdn}"
-fi
-
 echo "==> Creating cloudron.conf"
 cat > "${CONFIG_DIR}/cloudron.conf" <<CONF_END
 {
@@ -220,7 +213,7 @@ cat > "${CONFIG_DIR}/cloudron.conf" <<CONF_END
     "apiServerOrigin": "${arg_api_server_origin}",
     "webServerOrigin": "${arg_web_server_origin}",
     "fqdn": "${arg_fqdn}",
-    "adminFqdn": "${admin_fqdn}",
+    "adminFqdn": "${arg_admin_fqdn}",
     "adminLocation": "${arg_admin_location}",
     "zoneName": "${arg_zone_name}",
     "provider": "${arg_provider}",