@wjwjq/release-helper 0.2.5 → 0.2.7

package/dist/deploy/pkg/nginx_binary/compile.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+# current nginx source code version 1.22.1
+
+./configure \
+  --prefix=/etc/nginx \
+  --conf-path=/etc/nginx/nginx.conf \
+  --error-log-path=/var/log/nginx/error.log \
+  --http-log-path=/var/log/nginx/access.log \
+  --pid-path=/var/run/nginx.pid \
+  --lock-path=/var/run/nginx/nginx.lock \
+  --with-http_ssl_module \
+  --with-http_v2_module \
+  --with-http_gzip_static_module \
+  --with-http_stub_status_module \
+  --with-stream \
+  --with-pcre
+
+make
+
+make install
+
+echo '------------------compile and install done----------------------------'
+
+arch=$(uname -m) 
+ssl_version=$(openssl version | grep -oP '\d+\.\d+' | sed -n '1p' 2>&1)
+
+if [[ -z "${arch}" ]]; then
+  arch="x86_64"
+fi
+
+if [[ -z "${ssl_version}" ]]; then
+  ssl_version="1.0.2"
+fi
+
+cd /etc || exit
+
+tar -zcvf nginx-"$arch"-ssl"$ssl_version".tar.gz nginx/ -C /root
+
+echo "-----------pack at: /root  nginx-"$arch"-ssl"$ssl_version".tar.gz--------------"

package/dist/deploy/script/common.sh

@@ -24,6 +24,13 @@ log_success() {
   echo "$now: [success] $1" >>"$execute_log_path"
 }
 
+log_warn() {
+  now=$(date "+%Y-%m-%d %H:%M:%S")
+  echo "$(tput setaf 3)""$now": "$1""$(tput sgr0)"
+  
+  echo "$now: [success] $1" >>"$execute_log_path"
+}
+
 log_error() {
   now=$(date "+%Y-%m-%d %H:%M:%S")
   echo "$(tput setaf 1)""$now": "$1" "$(tput sgr0)"
@@ -132,7 +139,31 @@ install_assets() {
 
 }
 
+now=$(date "+%Y-%m-%d_%H:%M:%S")
+time=$now
+old_version=$(get_old_version)
+
+backup(){
+  source_type=$1
+
+    #备份整个服务 eg: /opt/posidon-frontend
+  if [[ -n "${old_version}" ]]; then
+    backup_dir="$install_path"backup
+    mkdir -p $backup_dir
+
+    # 分开备份nginx 和assets
+    backup_path=$backup_dir"/"$old_version"_"$time
+    mkdir -p "$backup_path"
+
+    echo "${app_name} $source_type backup at: $backup_path"
+    mv "$install_path$source_type" "$backup_path"
+  fi
+}
+
+
 start() {
+  callBy=$1
+
   # 仅静态文件
   if [[ "${mode}" != 3 ]]; then
     # 未安装
@@ -168,29 +199,51 @@ start() {
 
   # 创建用户
   create_user_csri
-
-  now=$(date "+%Y-%m-%d_%H:%M:%S")
-  old_version=$(get_old_version)
-
-  #备份整个服务 eg: /opt/posidon-frontend
-  if [[ -n "${old_version}" ]]; then
-    parent_store_path=$(echo "$install_path" | sed -e "s/\/${app_name}//")
-    backup_path=$parent_store_path""$app_name"_"$old_version"_"$now
-    echo "${app_name} assets backup at: $backup_path"
-    mv "$install_path" "$backup_path"
-  fi
-
   mkdir -p "$install_path"
 
+
   # 仅静态文件
   if [[ "${mode}" != 3 ]]; then
-    copy_nginx_conf_and_write_verison
-    add_nginx_service
-    add_log_rotate
+    if [ -f "${nginx_conf_path}" ]; then
+     while true; do
+      read -r -p "nginx.conf file already exists, update it?[Y/N]" yn
+      case $yn in
+      [Yy]*)
+        # 备份nginx配置目录
+        backup nginx;
+
+        copy_nginx_conf_and_write_verison
+        add_nginx_service
+        add_log_rotate
+        
+        if [[ $? != 0 ]]; then
+          echo "$(tput setaf 1)"failed to update nginx.conf!"$(tput sgr0)"
+          exit 1
+        else
+          log_warn "!!!!!!!!!nginx.conf has been updated, please note the changes, such as port 5443 !!!!!!!!!!"
+        fi
+        break
+        ;;
+      [Nn]*) break ;;
+      *) echo "Please answer yes or no." ;;
+      esac
+      done
+    else
+      copy_nginx_conf_and_write_verison
+      add_nginx_service
+      add_log_rotate
+    fi
   fi
 
+  # 备份静态资源目录
+  backup assets;
+
   install_assets
 
+  # 修改/etc/nginx 用户(组)
+  chown -R $user:$usergroup "$nginx_binary_install_path"
+  chmod 744 -R "$nginx_binary_install_path"
+
   # 修改所属用户
   chown -R $user:$usergroup "$install_path"
   chmod 744 -R "$install_path"

package/dist/deploy/script/install.sh

@@ -4,4 +4,4 @@ basepath=$(dirname "$(realpath "${BASH_SOURCE[-1]}")")
 
 source "$basepath"/common.sh
 
-start
+start 'install'

package/dist/deploy/script/nginx.sh

@@ -241,66 +241,65 @@ install_nginx_binary() {
   arch=$(uname -m)
   ssl_version=$(openssl version | grep -oP '\d+\.\d+' | sed -n '1p' 2>&1)
 
-  # if [[ -z "${arch}" ]]; then
-  #   arch="x86_64"
-  # fi
-
-  # if [[ $arch == arm* ]] || [[ $arch = aarch64 ]]; then
-  #   arch="arm"
-  # fi
+  if [[ -z "${arch}" ]]; then
+    arch="x86_64"
+  fi
 
-  # if [[ "${ssl_version}" == "1.0" ]]; then
-  #   ssl_version="1.0.2"
-  # fi
+  if [[ $arch == arm* ]] || [[ $arch = aarch64 ]]; then
+    arch="arm"
+  fi
 
-  # if [[ "${ssl_version}" == "1.1" ]]; then
-  #   ssl_version="1.1.1"
-  # fi
+  if [[ "${ssl_version}" == "1.0" ]]; then
+    ssl_version="1.0.2"
+  fi
 
-  # if [[ "${ssl_version}" == "3.0" ]]; then
-  #   ssl_version="3.0.7"
-  # fi
+  if [[ "${ssl_version}" == "1.1" ]]; then
+    ssl_version="1.1.1"
+  fi
 
-  # if [[ -z "${ssl_version}" ]]; then
-  #   ssl_version="1.0.2"
-  # fi
+  if [[ "${ssl_version}" == "3.0" ]]; then
+    ssl_version="3.0.7"
+  fi
 
-  # pkg="$nginx_binary_pkg_path"/nginx-"$arch"-ssl"$ssl_version".tar.gz
+  if [[ -z "${ssl_version}" ]]; then
+    ssl_version="1.0.2"
+  fi
 
-  # if [ ! -f "$pkg" ]; then
-  #   log_error "Fatal error: nginx-$arch-ssl$ssl_version.tar.gz not matched!  contact developer!"
-  #   exit 1
-  # fi
+  pkg="$nginx_binary_pkg_path"/nginx-"$arch"-ssl"$ssl_version".tar.gz
 
-  # log "current arch: $arch, current ssl_version： $ssl_version"
+  if [ ! -f "$pkg" ]; then
+    log_error "Fatal error: nginx-$arch-ssl$ssl_version.tar.gz not matched!  contact developer!"
+    exit 1
+  fi
 
-  # tar -zxvhf "$pkg" -C "$nginx_binary_install_path" --strip-components 1
+  log "current arch: $arch, current ssl_version： $ssl_version"
 
+  tar -zxvhf "$pkg" -C "$nginx_binary_install_path" --strip-components 1
 
-  check_dependency
-  # 检测是否安装成功
-  if [[ $? == 0 ]]; then
-    log_success "dependency installation successfully!"
-  else
-    log_error "dependency installation failed!"
-  fi
+  # check_dependency
+  # # 检测是否安装成功
+  # if [[ $? == 0 ]]; then
+  #   log_success "dependency installation successfully!"
+  # else
+  #   log_error "dependency installation failed!"
+  # fi
   
-  log "start to complie and install nginx"
-
-  tar_name=$(ls ${nginx_binary_pkg_path}|grep nginx-.*.tar.gz)
-  tar_dir=${tar_name%.tar.gz*}
-  tar -zxvf "${nginx_binary_pkg_path}"/"${tar_name}"
-  cd "${tar_dir}"
-
-  ./configure \
-    --prefix=${nginx_binary_install_path} \
-    --with-http_ssl_module \
-    --with-http_v2_module \
-    --with-http_gzip_static_module \
-    --with-http_stub_status_module \
-    --with-stream 
-
-  make && make install
+  # log "start to complie and install nginx"
+
+  # tar_name=$(ls ${nginx_binary_pkg_path}|grep nginx-.*.tar.gz)
+  # tar_dir=${tar_name%.tar.gz*}
+  # tar -zxvf "${nginx_binary_pkg_path}"/"${tar_name}"
+  # cd "${tar_dir}"
+
+  # ./configure \
+  #   --prefix=${nginx_binary_install_path} \
+  #   --with-http_ssl_module \
+  #   --with-http_v2_module \
+  #   --with-http_gzip_static_module \
+  #   --with-http_stub_status_module \
+  #   --with-stream 
+
+  # make && make install
   # 检测是否安装成功
   if [[ $? == 0 ]]; then
     log_success "nginx installation successfully!"
@@ -308,14 +307,13 @@ install_nginx_binary() {
     log_error "nginx installation failed!"
   fi
 
-  cp $nginx_binary_install_path/conf/mime.types $nginx_binary_install_path
+  # cp $nginx_binary_install_path/conf/mime.types $nginx_binary_install_path
 
   mkdir -p /usr/local/bin
+  mkdir -p /var/log/nginx
   ln -sf "$nginx_binary_install_path"sbin/nginx /usr/sbin/nginx
-  cd ..
+  # cd ..
+
 
-  # 修改/etc/nginx 用户(组)
-  chown -R $user:$usergroup "$nginx_binary_install_path"
-  chmod 744 -R "$nginx_binary_install_path"
 }
 #------------------------------------ nginx 可执行程序相关 end ----------------------------------

package/dist/deploy/script/upgrade.sh

@@ -4,4 +4,4 @@ basepath=$(dirname "$(realpath "${BASH_SOURCE[-1]}")")
 
 source "$basepath"/common.sh
 
-start
+start 'upgrade'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wjwjq/release-helper",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "generate deployment package for frontend, include nginx...",
   "main": "dist/index.js",
   "module": "dist/index.js",