Merge pull request #341 from jumpserver/pr@v3.6@remove_domains

perf: 移除 domains 相关代码
jumpserver · Aug 18, 2023 · f9e42b1 · f9e42b1
2 parents 19e8a1c + 3b1bdb1
commit f9e42b1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 32 deletions.
diff --git a/scripts/1_config_jumpserver.sh b/scripts/1_config_jumpserver.sh
@@ -153,18 +153,6 @@ function set_service() {
   ssh_port=$(get_config SSH_PORT)
   rdp_port=$(get_config RDP_PORT)
   use_xpack=$(get_config_or_env USE_XPACK)
-  domains=$(get_config DOMAINS)
-  if [[ -z "${domains}" ]]; then
-    read_from_input domains "$(gettext 'Please enter the access IP or domain name of JumpServer') (eg: demo.jumpserver.org:443, or eg: 172.17.200.191:80)" "" "${domains}"
-    if [[ -z "${domains}" ]] || [[ "${domains}" == "y" ]] || [[ "${domains}" == "n" ]]; then
-      host=$(get_host_ip)
-      if [[ -n "${host}" ]]; then
-          domains="${host}"
-      fi
-    fi
-    set_config DOMAINS "${domains}"
-  fi
-
   confirm="n"
   read_from_input confirm "$(gettext 'Do you need to customize the JumpServer external port')?" "y/n" "${confirm}"
   if [[ "${confirm}" == "y" ]]; then

diff --git a/scripts/7_upgrade.sh b/scripts/7_upgrade.sh
@@ -88,26 +88,6 @@ function upgrade_config() {
     MAGNUS_REDIS_PORT=63790
     set_config MAGNUS_REDIS_PORT "${MAGNUS_REDIS_PORT}"
   fi
-  domains=$(get_config DOMAINS)
-  if [[ -z "${domains}" ]]; then
-    echo
-    echo -e "\033[33m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-    echo -e "\033[33m                                \033[33mWARNING\033[33m                 "
-    echo -e "\033[33m                                                                        "
-    echo -e "\033[33m  从 v3.6.0 开始，必须配置 DOMAINS 可信任 IP 或 域名 才能正常访问服务。    "
-    echo -e "\033[33m  详情: https://docs.jumpserver.org/zh/v3/installation/upgrade_notice/  "
-    echo -e "\033[33m                                                                        "
-    echo -e "\033[33m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-    echo -e "\033[0m"
-    read_from_input domains "$(gettext 'Please enter the access IP or domain name of JumpServer') (eg: demo.jumpserver.org:443, or eg: 172.17.200.191:80)" "" "${domains}"
-    if [[ -z "${domains}" ]] || [[ "${domains}" == "y" ]] || [[ "${domains}" == "n" ]]; then
-      host=$(get_host_ip)
-      if [[ -n "${host}" ]]; then
-          domains="${host}"
-      fi
-    fi
-    set_config DOMAINS "${domains}"
-  fi
   # XPACK
   use_xpack=$(get_config_or_env USE_XPACK)
   if [[ "${use_xpack}" == "1" ]]; then