@wjwjq/release-helper 0.2.95 → 0.2.97

package/dist/deploy/script/nginx.sh

@@ -1,51 +1,55 @@
 #!/bin/bash
 
 # 安装包所在路径
-pkg_path="${project_path}/pkg"
+readonly PKG_DIR="${PROJECT_PATH}/pkg"
 
 #------------------------------------ nginx服务配置文件服务 start----------------------------------
 # 配置文件所在路径
-new_nginx_conf_path="${pkg_path}/nginx"
+readonly NEW_NGINX_CONF_PATH="${PKG_DIR}/nginx"
 
 # 指定安装目录
-nginx_conf_install_path="$prefix/opt/${app_name}/nginx/"
+readonly NGINX_CONF_INSTALL_PATH="$prefix/opt/${APP_NAME}/nginx/"
 
 # nginx服务配置文件路径
-nginx_conf_path="${nginx_conf_install_path}nginx.conf"
+readonly NGINX_CONF_PATH="${NGINX_CONF_INSTALL_PATH}nginx.conf"
 
 # asset_path="$prefix/opt/posidon-frontend/"
-nginx_info_path="/var/log/${app_name}"
-nginx_log_file="nginx.log"
+readonly NGINX_INFO_PATH="/var/log/${APP_NAME}"
+readonly NGINX_LOG_FILE="nginx.log"
 #不放在var/run 是因为重启后 var/run/下面的文件及目录会被清除
-nginx_pid_file_path="$nginx_info_path/nginx.pid"
+readonly NGINX_PID_FILE_PATH="$NGINX_INFO_PATH/nginx.pid"
 
-conf_version=$(awk '{print $1}' "${pkg_path}"/version)
+readonly MIME_TYPE_PATH="  ${MIME_TYPE}/"
+
+
+conf_version=$(awk '{print $1}' "${PKG_DIR}"/version)
 echo "$conf_version"
 
-copy_nginx_conf_and_write_verison() {
-  mkdir -p "$nginx_conf_install_path"
+copy_nginx_conf_and_write_version() {
+  mkdir -p "$NGINX_CONF_INSTALL_PATH"
   #  创建pid目录. 创建日志目录
-  mkdir -p $nginx_info_path
-  touch $nginx_info_path/$nginx_log_file
-  chown -R $user:$usergroup $nginx_info_path
-  chmod 744 -R $nginx_info_path
+  mkdir -p $NGINX_INFO_PATH
+  touch $NGINX_INFO_PATH/$NGINX_LOG_FILE
+  chown -R $user:$usergroup $NGINX_INFO_PATH
+  chmod 744 -R $NGINX_INFO_PATH
 
   access_log_super="access_log /dev/stdout main"
   error_log_super="error_log /dev/stderr warn"
-  access_log="access_log $nginx_info_path/$nginx_log_file main"
-  error_log="error_log $nginx_info_path/$nginx_log_file"
-  pid_file="pid  $nginx_pid_file_path"
+  access_log="access_log $NGINX_INFO_PATH/$NGINX_LOG_FILE main"
+  error_log="error_log $NGINX_INFO_PATH/$NGINX_LOG_FILE"
+  pid_file="pid  $NGINX_PID_FILE_PATH"
+  mime_type="include  $INSTALL_PATH/mime.types;"
 
   exec=$(get_exec_path)
 
-  # if [ -f "$nginx_conf_path" ]; then
-  #   old_version=$(sed -n '1p' "$nginx_conf_path" | sed 's/# version: //' | sed "s/\s\+//g")
+  # if [ -f "$NGINX_CONF_PATH" ]; then
+  #   old_version=$(sed -n '1p' "$NGINX_CONF_PATH" | sed 's/# version: //' | sed "s/\s\+//g")
 
   #   if [[ -n "${old_version}" ]]; then
   #     now=$(date "+%Y-%m-%d_%H:%M:%S")
 
   #     # echo "nginx_"$old_version"_"$now".conf"
-  #     mv "$nginx_conf_path" "${nginx_conf_install_path}"/"$app_name".nginx_"$old_version"_"$now".conf
+  #     mv "$NGINX_CONF_PATH" "${NGINX_CONF_INSTALL_PATH}"/"$APP_NAME".nginx_"$old_version"_"$now".conf
   #   fi
   # fi
 
@@ -53,7 +57,7 @@ copy_nginx_conf_and_write_verison() {
   nginx_version=$($exec -v 2>&1)
 
   tmp_file='./nginx/nginx.conf'
-  cp -rf "$new_nginx_conf_path" ./
+  cp -rf "$NEW_NGINX_CONF_PATH" ./
 
   sed -i "1i\# ${nginx_version}" $tmp_file
   sed -i "1i\# version: ${conf_version}" $tmp_file
@@ -89,7 +93,7 @@ copy_nginx_conf_and_write_verison() {
     # fi
   fi
 
-  n=$(grep -wn "#PID_FILE_PALCEHOLDER" $tmp_file | awk -F: '{print $1}' | sed -n 1p)
+  n=$(grep -wn "#PID_FILE_PLACEHOLDER" $tmp_file | awk -F: '{print $1}' | sed -n 1p)
   if [[ -n "${n}" ]]; then
     sed -i "${n}c ${pid_file};" $tmp_file
     # 非supervisorctl
@@ -107,23 +111,23 @@ copy_nginx_conf_and_write_verison() {
   fi
 
   # 拷贝整个nginx目录
-  mv -fb ./nginx/* "$nginx_conf_install_path"
+  mv -fb ./nginx/* "$NGINX_CONF_INSTALL_PATH"
 
   mkdir -p /data/command/
   log "nginx start command: $(get_exec_cmd)"
-  echo "$exec -c  $nginx_conf_path" >/data/command/nginx
+  echo "$exec -c  $NGINX_CONF_PATH" >/data/command/nginx
 
   if [[ $? == 0 ]]; then
-    log_success "$conf_version $nginx_conf_path replaced successfully!"
+    log_success "$conf_version $NGINX_CONF_PATH replaced successfully!"
   else
-    log_error "$conf_version $nginx_conf_path replaced failed!"
+    log_error "$conf_version $NGINX_CONF_PATH replaced failed!"
   fi
 }
 
 get_exec_path() {
   cmd=''
   if [[ -n "${prefix}" ]]; then
-    cmd="${nginx_conf_install_path}/sbin/nginx"
+    cmd="${NGINX_CONF_INSTALL_PATH}/sbin/nginx"
   else
     cmd="/usr/sbin/nginx"
   fi
@@ -134,63 +138,60 @@ get_exec_path() {
 get_exec_cmd() {
   exec=$(get_exec_path)
 
-  echo "$exec -c $nginx_conf_path"
+  echo "$exec -c $NGINX_CONF_PATH"
 }
 
 add_nginx_service() {
   #添加到服务
-  exec_cmd="$(get_exec_cmd) -e $nginx_info_path/$nginx_log_file"
-  cp "$pkg_path"/nginx/nginx.service.tpl ./nginx.service
+  exec_cmd="$(get_exec_cmd) -e $NGINX_INFO_PATH/$NGINX_LOG_FILE"
+  cp "$PKG_DIR"/nginx/nginx.service.tpl ./nginx.service
 
-  check_cmd="$exec -t -c $nginx_conf_path -e $nginx_info_path/$nginx_log_file"
+  check_cmd="$exec -t -c $NGINX_CONF_PATH -e $NGINX_INFO_PATH/$NGINX_LOG_FILE"
   version=$(echo "$conf_version" | grep -oP '\d+\.\d+\.\d+')
 
   sed -i "s#_user_group_#$usergroup#g" ./nginx.service
   sed -i "s#_user_#$user#g" ./nginx.service
   sed -i "s#_exec_cmd_#$exec_cmd #g" ./nginx.service
-  sed -i "s#_log_path_#$nginx_info_path#g" ./nginx.service
-  sed -i "s#_log_file_#$nginx_log_file#g" ./nginx.service
-  sed -i "s#_conf_path_#$nginx_conf_path#g" ./nginx.service
+  sed -i "s#_log_path_#$NGINX_INFO_PATH#g" ./nginx.service
+  sed -i "s#_log_file_#$NGINX_LOG_FILE#g" ./nginx.service
+  sed -i "s#_conf_path_#$NGINX_CONF_PATH#g" ./nginx.service
   sed -i "s#_version_#$version#g" ./nginx.service
-  sed -i "s#_pid_file_#$nginx_pid_file_path#g" ./nginx.service
+  sed -i "s#_pid_file_#$NGINX_PID_FILE_PATH#g" ./nginx.service
   #sed -i "s#_start_check_#$check_cmd#g" ./nginx.service
 
   if ((mode == 2)); then
     # systemctl enable nginx
-    cp ./nginx.service /usr/lib/systemd/system/"$app_name".nginx.service
+    cp ./nginx.service /usr/lib/systemd/system/"$APP_NAME".nginx.service
     systemctl daemon-reload
 
-    log_success "add ${app_name}.nginx.service to /usr/lib/systemd/system/"
+    log_success "add ${APP_NAME}.nginx.service to /usr/lib/systemd/system/"
   else
-    rm -rf /usr/lib/systemd/system/"$app_name".nginx.service
+    rm -rf /usr/lib/systemd/system/"$APP_NAME".nginx.service
   fi
 }
 
 add_log_rotate(){
   mkdir -p /etc/logrotate.d
 
-  rm -rf /etc/logrotate.d/${app_name}.nginx
+  rm -rf /etc/logrotate.d/${APP_NAME}.nginx
    #添加日志翻转
-  cp "$pkg_path"/nginx/nginx.logrotate.tpl ./nginx.logrotate
+  cp "$PKG_DIR"/nginx/nginx.logrotate.tpl ./nginx.logrotate
 
   sed -i "s#__usergroup__#$usergroup#g" ./nginx.logrotate
   sed -i "s#__user__#$user#g" ./nginx.logrotate
-  sed -i "s#__app_name__#$app_name#g" ./nginx.logrotate
-  sed -i "s#__pid_file__#$nginx_pid_file_path#g" ./nginx.logrotate
+  sed -i "s#__APP_NAME__#$APP_NAME#g" ./nginx.logrotate
+  sed -i "s#__pid_file__#$NGINX_PID_FILE_PATH#g" ./nginx.logrotate
   
-  cp -f ./nginx.logrotate /etc/logrotate.d/${app_name}.nginx
+  cp -f ./nginx.logrotate /etc/logrotate.d/${APP_NAME}.nginx
 }
 #------------------------------------ nginx服务配置文件服务 end----------------------------------
 
 
 #------------------------------------ nginx 可执行程序相关 start----------------------------------
-# 指定安装目录
-nginx_binary_install_path="/etc/nginx/"
-
-mkdir -p "$nginx_binary_install_path"
-
 # 安装包所在路径
-nginx_binary_pkg_path="${pkg_path}/nginx_binary"
+readonly NGINX_BINARY_PKG_PATH="${PKG_DIR}/nginx_binary"
+
+readonly NGINX_BINARY_INSTALL_PATH="/etc/nginx/"
 
 open_port_80() {
   # 查看防火墙是否开启
@@ -207,74 +208,57 @@ open_port_80() {
   # 重启防火墙（关键步骤二）
   firewall-cmd --reload
 }
-
-function check_dependency(){
-  if [[ -z $(rpm -qa | grep ^gcc | grep -v grep) ]];
-  then
-    cd ${nginx_binary_pkg_path}/gcc && rpm -Uvh *.rpm --nodeps --force 
-  fi
-  if [[ -z $(rpm -qa | grep ^gcc-c++ | grep -v grep) ]];
-  then
-    cd ${nginx_binary_pkg_path}/g++ && rpm -Uvh *.rpm --nodeps --force 
-  fi
-  if [[ -z $(rpm -qa | grep ^zlib-devel | grep -v grep) ]];
-  then
-    cd ${nginx_binary_pkg_path}/zlib && rpm -Uvh *.rpm --nodeps --force 
-  fi
-  if [[ -z $(rpm -qa | grep ^openssl-devel | grep -v grep) ]];
-  then
-    cd ${nginx_binary_pkg_path}/openssl && rpm -Uvh *.rpm --nodeps --force 
-  fi
-  if [[ -z $(rpm -qa | grep ^pcre-devel | grep -v grep) ]];
-  then
-    cd ${nginx_binary_pkg_path}/pcre && rpm -Uvh *.rpm --nodeps --force 
-  fi
-
-  cd $project_path/script
-}
- 
-
  
 install_nginx_from_binary(){
   log "start to install nginx binary"
 
   arch=$(uname -m)
-  ssl_version=$(openssl version | grep -oP '\d+\.\d+' | sed -n '1p' 2>&1)
+  system_name=$(uname -r | awk -F'.' '{print $(NF-1)}')
+  ssl_full_version=$(openssl version | awk '{print $2}')
+  ssl_fuzzy_version=$(openssl version | grep -oP '\d+\.\d+' | sed -n '1p' 2>&1)
+  system_name_with_arch=$system_name"."$arch
 
-  if [[ -z "${arch}" ]]; then
-    arch="x86_64"
-  fi
+  # 若存在完整的系统名称.架构.ssl版本的包则优先使用该包安装
+  pkg="$NGINX_BINARY_PKG_PATH"/binary/nginx-"$system_name_with_arch"-ssl"$ssl_full_version".tar.gz
 
-  if [[ $arch == arm* ]] || [[ $arch = aarch64 ]]; then
-    arch="arm"
-  fi
+  if [ -f "$pkg" ]; then
+    log "current arch: $system_name_with_arch, current ssl_version： $ssl_full_version"
+  else
+    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_fuzzy_version}" == "1.0" ]]; then
+      ssl_fuzzy_version="1.0.2"
+    fi
 
-  if [[ "${ssl_version}" == "3.0" ]]; then
-    ssl_version="3.0.7"
-  fi
+    if [[ "${ssl_fuzzy_version}" == "1.1" ]]; then
+      ssl_fuzzy_version="1.1.1"
+    fi
 
-  if [[ -z "${ssl_version}" ]]; then
-    ssl_version="1.0.2"
-  fi
+    if [[ "${ssl_fuzzy_version}" == "3.0" ]]; then
+      ssl_fuzzy_version="3.0.7"
+    fi
 
-  pkg="$nginx_binary_pkg_path"/binary/nginx-"$arch"-ssl"$ssl_version".tar.gz
+    if [[ -z "${ssl_fuzzy_version}" ]]; then
+      ssl_fuzzy_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"/binary/nginx-"$arch"-ssl"$ssl_fuzzy_version".tar.gz
+
+    if [ ! -f "$pkg" ]; then
+      log_error "Fatal error: nginx-$arch-ssl$ssl_fuzzy_version.tar.gz not matched!  contact developer!"
+      exit 1
+    fi
 
-  log "current arch: $arch, current ssl_version： $ssl_version"
+    log "current arch: $arch, current ssl_version： $ssl_fuzzy_version"
+  fi
 
-  tar -zxvhf "$pkg" -C "$nginx_binary_install_path" --strip-components 1
+  tar -zxvhf "$pkg" -C "$NGINX_BINARY_INSTALL_PATH" --strip-components 1
 
   # 检测是否安装成功
   if [[ $? == 0 ]]; then
@@ -288,7 +272,7 @@ install_nginx_from_binary(){
 
 install_nginx_from_source(){
   log "start to complie and install nginx"
-  pkg="$nginx_binary_pkg_path"/source/
+  pkg="$NGINX_BINARY_PKG_PATH"/source/
   tar_name=$(ls ${pkg}|grep nginx-.*.tar.gz)
   tar_dir=${tar_name%.tar.gz*}
   tar -zxvf "${pkg}"/"${tar_name}"
@@ -300,7 +284,7 @@ install_nginx_from_source(){
     --with-http_gzip_static_module \
     --with-http_stub_status_module \
     --with-stream \
-    --prefix=${nginx_binary_install_path}
+    --prefix=${NGINX_BINARY_INSTALL_PATH}
 
   make && make install
   # 检测是否安装成功
@@ -310,13 +294,13 @@ install_nginx_from_source(){
     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
   cd ..
 }
 
 # 安装nginx可执行程序
 install_nginx_binary() {
-  log "install nginx to path: ${nginx_binary_install_path}"
+  log "install nginx to path: ${NGINX_BINARY_INSTALL_PATH}"
   
   if [[ "${nginx_install_mode}" == "source" ]]; then
     install_nginx_from_source
@@ -326,6 +310,6 @@ install_nginx_binary() {
 
   mkdir -p /usr/local/bin
   mkdir -p /var/log/nginx
-  ln -sf "$nginx_binary_install_path"sbin/nginx /usr/sbin/nginx
+  ln -sf "$NGINX_BINARY_INSTALL_PATH"sbin/nginx /usr/sbin/nginx
 }
 #------------------------------------ nginx 可执行程序相关 end ----------------------------------

package/dist/pack.js

@@ -35,6 +35,7 @@ async function pack(version) {
     const projectDir = resolve(__releaseDir, projectName);
     const assetsDir = resolve(projectDir, "pkg/assets");
     const nginxDir = resolve(projectDir, "pkg/nginx");
+    const scriptDir = resolve(projectDir, "script");
     fs.cpSync(resolve(__dirname, "deploy"), projectDir, { recursive: true });
     fs.cpSync(resolve(__work_dir, releaseConf.assetsDir), assetsDir, { recursive: true });
     fs.writeFileSync(resolve(projectDir, "pkg", "version"), version, { encoding: "utf-8" });
@@ -80,6 +81,9 @@ async function pack(version) {
       replaced: [["__root__", `${assetInstallPath}assets/`]]
       // writeToNewFilePath: resolve(nginxDir, `${projectName}.conf`)
     });
+    if (fs.existsSync(resolve(__releaseDir, "script", "after.sh"))) {
+      fs.copyFileSync(resolve(__releaseDir, "script", "after.sh"), resolve(scriptDir, "after.sh"));
+    }
     logger.info(pc.green(`start to generate ${zipFileName}`));
     const zipFilePath = resolve(__releaseDir, zipFileName);
     await genTarPkg(__releaseDir, projectName, zipFilePath);

package/dist/prepare.js

@@ -39,6 +39,8 @@ const releaseConf = Object.assign({
   userGroup: "root",
   installMode: "all",
   installDir: "/opt",
+  nginxBinaryDir: "/etc/nginx",
+  nginxConfDir: "/etc/nginx",
   nginxInstallMode: "binary",
   dockerInstallDir: "",
   dockerBackupDir: ""
@@ -79,10 +81,7 @@ async function checkEnvInfo() {
     process.exit(1);
   }
   for (let [field, value] of Object.entries(releaseConf)) {
-    if (!value) {
-      logger.error(`The field: [${field}] is required in  .release/release.conf.yaml!`);
-      process.exit(1);
-    }
+    validateField(field);
     if (field === "installMode" && !installMode.includes(value)) {
       logger.error(`The field: [${field}]'s value should be one of ${installMode.join(" | ")}`);
       process.exit(1);
@@ -97,5 +96,16 @@ async function checkEnvInfo() {
     }
   }
 }
+function validateFields(fields) {
+  for (let field of fields) {
+    validateField(field);
+  }
+}
+function validateField(field) {
+  if (!releaseConf[field]) {
+    logger.error(`The field: [${field}] is required in  .release/release.conf.yaml!`);
+    process.exit(1);
+  }
+}
 
-export { __dirname, __releaseConfPath, __releaseDir, __work_dir, checkEnvInfo, prepare, releaseConf, releaseConfFileName };
+export { __dirname, __releaseConfPath, __releaseDir, __work_dir, checkEnvInfo, prepare, releaseConf, releaseConfFileName, validateField, validateFields };

package/package.json

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