From 3db1920ae587c28b9ec3c8e49985bf1bc8715cef Mon Sep 17 00:00:00 2001
From: Linhe Huo <linhehuo@gmail.com>
Date: Tue, 27 Sep 2022 19:56:51 +0800
Subject: [PATCH] chore: install new web service instead of nginxd (#17090)

Partial of [TD-19267](https://jira.taosdata.com:18080/browse/TD-19268)
---
 packaging/cfg/nginxd.service    | 22 ---------
 packaging/check_package.sh      | 10 +---
 packaging/tools/install.sh      | 81 +++++----------------------------
 packaging/tools/make_install.sh | 13 ++++++
 packaging/tools/makepkg.sh      | 23 ++++------
 packaging/tools/remove.sh       | 15 ------
 6 files changed, 34 insertions(+), 130 deletions(-)
 delete mode 100644 packaging/cfg/nginxd.service

diff --git a/packaging/cfg/nginxd.service b/packaging/cfg/nginxd.service
deleted file mode 100644
index 50bbc1a21d..0000000000
--- a/packaging/cfg/nginxd.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=Nginx For TDengine Service
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-Type=forking
-PIDFile=/usr/local/nginxd/logs/nginx.pid
-ExecStart=/usr/local/nginxd/sbin/nginx
-ExecStop=/usr/local/nginxd/sbin/nginx -s stop
-TimeoutStopSec=1000000s
-LimitNOFILE=infinity
-LimitNPROC=infinity
-LimitCORE=infinity
-TimeoutStartSec=0
-StandardOutput=null
-Restart=always
-StartLimitBurst=3
-StartLimitInterval=60s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/packaging/check_package.sh b/packaging/check_package.sh
index e728c6455a..5c3a2f9267 100644
--- a/packaging/check_package.sh
+++ b/packaging/check_package.sh
@@ -38,8 +38,6 @@ temp_version=""
 fin_result=""
 
 service_config_dir="/etc/systemd/system"
-nginx_port=6060
-nginx_dir="/usr/local/nginxd"
 
 # Color setting
 RED='\033[0;31m'
@@ -132,10 +130,7 @@ function check_main_path() {
         check_file ${install_main_dir} $i
     done
     if [ "$verMode" == "cluster" ]; then
-        nginx_main_dir=("admin" "conf" "html" "sbin" "logs")
-        for i in "${nginx_main_dir[@]}";do
-            check_file ${nginx_dir}  $i
-        done
+        check_file ${install_main_dir} "share/admin"
     fi
     echo -e "Check main path:\033[32mOK\033[0m!"
 }
@@ -150,9 +145,6 @@ function check_bin_path() {
     for i in "${lbin_dir[@]}";do
         check_link ${bin_link_dir}/$i
     done
-    if [ "$verMode" == "cluster" ]; then
-        check_file ${nginx_dir}/sbin nginx
-    fi
     echo -e "Check bin  path:\033[32mOK\033[0m!"
 }
 
diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
index 5088e9bdac..19abda8793 100755
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -50,8 +50,7 @@ install_main_dir=${installDir}
 bin_dir="${installDir}/bin"
 
 service_config_dir="/etc/systemd/system"
-nginx_port=6060
-nginx_dir="/usr/local/nginxd"
+web_port=6041
 
 # Color setting
 RED='\033[0;31m'
@@ -182,7 +181,7 @@ function install_main_path() {
   ${csudo}mkdir -p ${install_main_dir}/include
   #  ${csudo}mkdir -p ${install_main_dir}/init.d
   if [ "$verMode" == "cluster" ]; then
-    ${csudo}mkdir -p ${nginx_dir}
+    ${csudo}mkdir -p ${install_main_dir}/share
   fi
 
   if [[ -e ${script_dir}/email ]]; then
@@ -218,12 +217,6 @@ function install_bin() {
   [ -x ${install_main_dir}/bin/TDinsight.sh ] && ${csudo}ln -s ${install_main_dir}/bin/TDinsight.sh ${bin_link_dir}/TDinsight.sh || :
   [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/${uninstallScript} || :
   [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
-
-  if [ "$verMode" == "cluster" ]; then
-    ${csudo}cp -r ${script_dir}/nginxd/* ${nginx_dir} && ${csudo}chmod 0555 ${nginx_dir}/*
-    ${csudo}mkdir -p ${nginx_dir}/logs
-    ${csudo}chmod 777 ${nginx_dir}/sbin/nginx
-  fi
 }
 
 function install_lib() {
@@ -574,6 +567,13 @@ function install_examples() {
   fi
 }
 
+function install_web() {
+  if [ -d "${script_dir}/share" ]; then
+    ${csudo}cp -rf ${binary_dir}/share/* ${install_main_dir}/share
+  fi
+}
+
+
 function clean_service_on_sysvinit() {
   if pidof ${serverName} &>/dev/null; then
     ${csudo}service ${serverName} stop || :
@@ -654,16 +654,6 @@ function clean_service_on_systemd() {
   fi
   ${csudo}systemctl disable tarbitratord &>/dev/null || echo &>/dev/null
   ${csudo}rm -f ${tarbitratord_service_config}
-
-  if [ "$verMode" == "cluster" ]; then
-    nginx_service_config="${service_config_dir}/nginxd.service"
-    if systemctl is-active --quiet nginxd; then
-      echo "Nginx for ${productName} is running, stopping it..."
-      ${csudo}systemctl stop nginxd &>/dev/null || echo &>/dev/null
-    fi
-    ${csudo}systemctl disable nginxd &>/dev/null || echo &>/dev/null
-    ${csudo}rm -f ${nginx_service_config}
-  fi
 }
 
 function install_service_on_systemd() {
@@ -677,19 +667,6 @@ function install_service_on_systemd() {
   ${csudo}systemctl enable ${serverName}
 
   ${csudo}systemctl daemon-reload
-
-  if [ "$verMode" == "cluster" ]; then
-    [ -f ${script_dir}/cfg/nginxd.service ] &&
-      ${csudo}cp ${script_dir}/cfg/nginxd.service \
-        ${service_config_dir}/ || :
-    ${csudo}systemctl daemon-reload
-
-    if ! ${csudo}systemctl enable nginxd &>/dev/null; then
-      ${csudo}systemctl daemon-reexec
-      ${csudo}systemctl enable nginxd
-    fi
-    ${csudo}systemctl start nginxd
-  fi
 }
 
 function install_adapter_service() {
@@ -793,19 +770,6 @@ function updateProduct() {
     sleep 1
   fi
 
-  if [ "$verMode" == "cluster" ]; then
-    if pidof nginx &>/dev/null; then
-      if ((${service_mod} == 0)); then
-        ${csudo}systemctl stop nginxd || :
-      elif ((${service_mod} == 1)); then
-        ${csudo}service nginxd stop || :
-      else
-        kill_process nginx
-      fi
-      sleep 1
-    fi
-  fi
-
   install_main_path
 
   install_log
@@ -817,6 +781,7 @@ function updateProduct() {
   fi
 
   install_examples
+  install_web
   if [ -z $1 ]; then
     install_bin
     install_service
@@ -825,18 +790,6 @@ function updateProduct() {
     install_adapter_config
 
     openresty_work=false
-    if [ "$verMode" == "cluster" ]; then
-      # Check if openresty is installed
-      # Check if nginx is installed successfully
-      if type curl &>/dev/null; then
-        if curl -sSf http://127.0.0.1:${nginx_port} &>/dev/null; then
-          echo -e "\033[44;32;1mNginx for ${productName} is updated successfully!${NC}"
-          openresty_work=true
-        else
-          echo -e "\033[44;31;5mNginx for ${productName} does not work! Please try again!\033[0m"
-        fi
-      fi
-    fi
 
     echo
     echo -e "${GREEN_DARK}To configure ${productName} ${NC}: edit ${cfg_install_dir}/${configFile}"
@@ -857,7 +810,7 @@ function updateProduct() {
     fi
 
     if [ ${openresty_work} = 'true' ]; then
-      echo -e "${GREEN_DARK}To access ${productName}    ${NC}: use ${GREEN_UNDERLINE}${clientName} -h $serverFqdn${NC} in shell OR from ${GREEN_UNDERLINE}http://127.0.0.1:${nginx_port}${NC}"
+      echo -e "${GREEN_DARK}To access ${productName}    ${NC}: use ${GREEN_UNDERLINE}${clientName} -h $serverFqdn${NC} in shell OR from ${GREEN_UNDERLINE}http://127.0.0.1:${web_port}${NC}"
     else
       echo -e "${GREEN_DARK}To access ${productName}    ${NC}: use ${GREEN_UNDERLINE}${clientName} -h $serverFqdn${NC} in shell${NC}"
     fi
@@ -906,6 +859,7 @@ function installProduct() {
       install_connector
   fi
   install_examples
+  install_web
 
   if [ -z $1 ]; then # install service and client
     # For installing new
@@ -915,17 +869,6 @@ function installProduct() {
     install_adapter_config
 
     openresty_work=false
-    if [ "$verMode" == "cluster" ]; then
-      # Check if nginx is installed successfully
-      if type curl &>/dev/null; then
-        if curl -sSf http://127.0.0.1:${nginx_port} &>/dev/null; then
-          echo -e "\033[44;32;1mNginx for ${productName} is installed successfully!${NC}"
-          openresty_work=true
-        else
-          echo -e "\033[44;31;5mNginx for ${productName} does not work! Please try again!\033[0m"
-        fi
-      fi
-    fi
 
     install_config
 
diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh
index d1e7a222cc..58b4385001 100755
--- a/packaging/tools/make_install.sh
+++ b/packaging/tools/make_install.sh
@@ -151,6 +151,7 @@ function install_main_path() {
     ${csudo}mkdir -p ${install_main_dir}/driver
     ${csudo}mkdir -p ${install_main_dir}/examples
     ${csudo}mkdir -p ${install_main_dir}/include
+    ${csudo}mkdir -p ${install_main_dir}/share
     #    ${csudo}mkdir -p ${install_main_dir}/init.d
   else
     ${csudo}rm -rf ${install_main_dir} || ${csudo}rm -rf ${install_main_2_dir} || :
@@ -161,6 +162,7 @@ function install_main_path() {
     ${csudo}mkdir -p ${install_main_dir}/driver || ${csudo}mkdir -p ${install_main_2_dir}/driver
     ${csudo}mkdir -p ${install_main_dir}/examples || ${csudo}mkdir -p ${install_main_2_dir}/examples
     ${csudo}mkdir -p ${install_main_dir}/include || ${csudo}mkdir -p ${install_main_2_dir}/include
+    ${csudo}mkdir -p ${install_main_dir}/share || ${csudo}mkdir -p ${install_main_2_dir}/share
   fi
 }
 
@@ -469,6 +471,16 @@ function install_examples() {
   fi
 }
 
+function install_web() {
+  if [ -d "${binary_dir}/build/share" ]; then
+    if [ "$osType" != "Darwin" ]; then
+      ${csudo}cp -rf ${binary_dir}/build/share/* ${install_main_dir}/share || :
+    else
+      ${csudo}cp -rf ${binary_dir}/build/share/* ${install_main_dir}/share || ${csudo}cp -rf ${binary_dir}/build/share/* ${install_main_2_dir}/share || :
+    fi
+  fi
+}
+
 function clean_service_on_sysvinit() {
   if pidof ${serverName} &>/dev/null; then
     ${csudo}service ${serverName} stop || :
@@ -596,6 +608,7 @@ function update_TDengine() {
   install_lib
   #  install_connector
   install_examples
+  install_web
   install_bin
 
   install_service
diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh
index 2305b96b36..fb0ef4f9a3 100755
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -107,7 +107,7 @@ else
 fi
 
 install_files="${script_dir}/install.sh"
-nginx_dir="${top_dir}/../enterprise/src/plugins/web"
+web_dir="${top_dir}/../enterprise/src/plugins/web"
 
 init_file_deb=${script_dir}/../deb/taosd
 init_file_rpm=${script_dir}/../rpm/taosd
@@ -132,10 +132,6 @@ if [ -f "${cfg_dir}/${serverName}.service" ]; then
   cp ${cfg_dir}/${serverName}.service ${install_dir}/cfg || :
 fi
 
-if [ -f "${top_dir}/packaging/cfg/nginxd.service" ]; then
-  cp ${top_dir}/packaging/cfg/nginxd.service ${install_dir}/cfg || :
-fi
-
 mkdir -p ${install_dir}/bin && cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/* || :
 mkdir -p ${install_dir}/init.d && cp ${init_file_deb} ${install_dir}/init.d/${serverName}.deb
 mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/${serverName}.rpm
@@ -222,16 +218,6 @@ if [ "$verMode" == "cluster" ]; then
   sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/bin/remove.sh >>remove_temp.sh
   mv remove_temp.sh ${install_dir}/bin/remove.sh
 
-  mkdir -p ${install_dir}/nginxd && cp -r ${nginx_dir}/* ${install_dir}/nginxd
-  cp ${nginx_dir}/png/taos.png ${install_dir}/nginxd/admin/images/taos.png
-  rm -rf ${install_dir}/nginxd/png
-
-  if [ "$cpuType" == "aarch64" ]; then
-    cp -f ${install_dir}/nginxd/sbin/arm/64bit/nginx ${install_dir}/nginxd/sbin/
-  elif [ "$cpuType" == "aarch32" ]; then
-    cp -f ${install_dir}/nginxd/sbin/arm/32bit/nginx ${install_dir}/nginxd/sbin/
-  fi
-  rm -rf ${install_dir}/nginxd/sbin/arm
 fi
 
 cd ${install_dir}
@@ -288,6 +274,13 @@ if [[ $dbName == "taos" ]]; then
     cp -r ${examples_dir}/C# ${install_dir}/examples
     mkdir -p ${install_dir}/examples/taosbenchmark-json && cp ${examples_dir}/../tools/taos-tools/example/* ${install_dir}/examples/taosbenchmark-json
   fi
+
+  # Add web files
+  if [ -d "${web_dir}/admin" ]; then
+    mkdir -p ${install_dir}/share/
+    cp ${web_dir}/admin ${install_dir}/share/ -r
+    cp ${web_dir}/png/taos.png ${install_dir}/share/admin/images/taos.png
+  fi
 fi
 
 # Copy driver
diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh
index bf4ff564f5..a648750904 100755
--- a/packaging/tools/remove.sh
+++ b/packaging/tools/remove.sh
@@ -27,13 +27,11 @@ local_bin_link_dir="/usr/local/bin"
 lib_link_dir="/usr/lib"
 lib64_link_dir="/usr/lib64"
 inc_link_dir="/usr/include"
-install_nginxd_dir="/usr/local/nginxd"
 
 service_config_dir="/etc/systemd/system"
 taos_service_name=${serverName}
 taosadapter_service_name="taosadapter"
 tarbitrator_service_name="tarbitratord"
-nginx_service_name="nginxd"
 csudo=""
 if command -v sudo >/dev/null; then
   csudo="sudo "
@@ -153,18 +151,6 @@ function clean_service_on_systemd() {
   fi
   ${csudo}systemctl disable ${tarbitrator_service_name} &>/dev/null || echo &>/dev/null
   ${csudo}rm -f ${tarbitratord_service_config}
-
-  if [ "$verMode" == "cluster" ]; then
-    nginx_service_config="${service_config_dir}/${nginx_service_name}.service"
-    if [ -d ${install_nginxd_dir} ]; then
-      if systemctl is-active --quiet ${nginx_service_name}; then
-        echo "Nginx for ${productName} is running, stopping it..."
-        ${csudo}systemctl stop ${nginx_service_name} &>/dev/null || echo &>/dev/null
-      fi
-      ${csudo}systemctl disable ${nginx_service_name} &>/dev/null || echo &>/dev/null
-      ${csudo}rm -f ${nginx_service_config}
-    fi
-  fi
 }
 
 function clean_service_on_sysvinit() {
@@ -239,7 +225,6 @@ clean_config
 ${csudo}rm -rf ${data_link_dir} || :
 
 ${csudo}rm -rf ${install_main_dir}
-${csudo}rm -rf ${install_nginxd_dir}
 if [[ -e /etc/os-release ]]; then
   osinfo=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
 else
-- 
GitLab