@wjwjq/release-helper 0.0.5 → 0.0.7

package/README.md

@@ -4,7 +4,15 @@
 
 服务器端安装和更新，请看发布后文档
 
-## 初始化
+## 安装
+
+```bash
+  pnpm add -D  @wjwjq/release-helper
+```
+
+## 使用
+
+### 初始化
 
 生成.release目录及相关配置文件环境
 
@@ -12,7 +20,7 @@
 release-helper init
 ```
 
-## 打包
+### 打包
 
 仅打包成xx.tar.gz  需指定release.conf.yaml中assetsDir字段
 
@@ -20,7 +28,7 @@ release-helper init
 release-helper pack
 ```
 
-## 发版
+### 发版
 
 发布git release相关版本； 需指定release.conf.yaml中host等相关字段
 

package/dist/.release/README.md

@@ -1,6 +1,52 @@
-# .release 目录说明
+# release-helper
 
-## doc 目录
+打包 和发布辅助工具, 集成nginx二进制文件，支持supervisor和systemctl启动安装模式
+
+服务器端安装和更新，请看发布后文档
+
+## 使用
+
+### 推荐
+
+在package.json中添加如下命令, 后续通过pnpm pak/pub/publish使用
+
+```bash
+  "pak": "release-helper pack",
+  "pub": "release-helper publish",
+  "release": "release-helper release",
+```
+
+### 单独使用命令
+
+请在项目根目录，使用命令
+
+#### 初始化
+
+常规来讲，通过pnpm安装时，会自动在项目根目录位置，生成.release目录，若未生成，请手动生成
+
+```bash
+release-helper init
+```
+
+#### 打包
+
+仅打包成xx.tar.gz  需指定release.conf.yaml中assetsDir字段
+
+```bash
+release-helper pack
+```
+
+#### 发版
+
+发布git release相关版本； 需指定release.conf.yaml中host等相关字段
+
+```bash
+release-helper release
+```
+
+## .release 目录说明
+
+### doc 目录
 
 用于release时附带的文档，文档中可以使用指定变量占位，后续执行release-helper release时会自动遍历，并替换所有变量
 
@@ -12,12 +58,16 @@
 | \$VERSION\$   | 用户指定的版本号                                     |
 | \$PKG_NAME\$  | tar.gz包名称（值为\$APP_NAME\$\_\$VERSION\$.tar.gz） |
 
-## nginx 目录
+### nginx 目录
 
-用于存放服务器端nginx的启动配置文件等，部分占位说明及占位符请勿删除，会在服务器端安装后更新时，由脚本自动替换
+用于存放服务器端nginx的启动配置文件等，部分占位说明及占位符请勿删除，会在服务器端安装或更新时，由脚本自动替换
 
 文件说明：
 | **文件或目录** | **说明**                                                  |
 | -------------- | --------------------------------------------------------- |
 | ca             | nginx https使用到的证书，变更时需对应修改nginx.conf中的值 |
-| nginx.conf     | nginx启动时 需要的配置文件                                |
+| nginx.conf     | nginx启动时 需要的配置文件                                |
+
+### release.conf.yaml
+
+打包发布相关配置项

package/dist/.release/release.conf.yaml

@@ -1,9 +1,12 @@
-
- #gitlab 仓库地址
-host: your git repo url
-# gitlab rest api token
-token: your git token
+#gitlab 仓库地址   your git repo url
+host: ''
+# gitlab rest api token  your git token
+token: ''
 # build script   default: npm run build  
 buildCmd: "npm run build"
 # 打包后资源 相对工作区所在路径  默认dist
-assetsDir: string 
+assetsDir: 'dist' 
+
+# nginx和assets 所属用户和用户组
+user: root
+userGroup: root

package/dist/deploy/nginx/script/install.sh

@@ -81,11 +81,7 @@ install() {
 
   tar -zxvhf "$pkg" -C "$install_path" --strip-components 1
 
-  mkdir -p /var/log/nginx
-
-  if [[ -z "${prefix}" ]]; then
-    cp "$install_path"/sbin/nginx /usr/sbin/
-  fi
+  cp "$install_path"nginx /usr/sbin/
 
   # 检测是否安装成功
   if [[ $? == 0 ]]; then

package/dist/deploy/pkg/nginx/nginx.service.tpl

@@ -5,8 +5,8 @@ Wants=network-online.target
 
 [Service]
 # 应用启动使用的用户及用户组,需各组件手动修改
-User=root
-Group=root
+User=_user_
+Group=_user_group_
 
 Environment="LOGPATH=_log_path_" "LOGFILE=_log_file_" "LOGROTATEDELAY=2592000000"  "CONFS=_conf_path_" "VERSION=_version_"
 
@@ -22,10 +22,9 @@ WorkingDirectory=/etc/nginx
 [Service]
 Type=forking
 PIDFile=_pid_file_
-ExecStartPre=_start_check_
 ExecStart=_exec_cmd_
-ExecReload=/bin/sh -c "/bin/kill -s HUP $(/bin/cat /var/run/nginx.pid)"
-ExecStop=/bin/sh -c "/bin/kill -s TERM $(/bin/cat /var/run/nginx.pid)"
+ExecReload=/bin/sh -c "/bin/kill -s HUP $(/bin/cat _pid_file_)"
+ExecStop=/bin/sh -c "/bin/kill -s TERM $(/bin/cat _pid_file_)"
 
 PrivateTmp=true
 

package/dist/deploy/script/common.sh

@@ -7,6 +7,8 @@ app_name=__APP_NAME__
 
 # 静态资源存放目录 eg: /opt/posidon-frontend/
 install_path=__INSTALL_PATH__
+user=__USER__
+usergroup=__USER_GROUP__
 
 execute_log_path="/var/log/${app_name}_script_execute_logs"
 
@@ -48,8 +50,8 @@ source "$basepath"/nginx.sh
 
 # 创建用户
 create_user_csri() {
-  user="csri"
-  group="csri"
+  user=$user
+  group=$usergroup
 
   #create group if not exists
   grep "^$group" /etc/group >&/dev/null
@@ -64,23 +66,6 @@ create_user_csri() {
   fi
 }
 
-find_nginx_pos() {
-  confpath=''
-  find / -name "nginx" -print0 >tmpfile
-  while IFS= read -r -d $'\0'; do
-    if [ -d "$REPLY/conf" ]; then # $prefix/etc/nginx
-      confpath="$REPLY/conf.d/"
-      break
-    elif [ -d "$REPLY/conf.d" ]; then # /etc/nginx
-      confpath="$REPLY/conf.d/"
-      break
-    fi
-  done <tmpfile
-  rm -f tmpfile
-
-  echo "$confpath"
-}
-
 has_nginx_installed=1
 
 # 检查 nginx 是否已安装
@@ -145,18 +130,6 @@ install_assets() {
 
   log_success "$install_path"assets/settings 已覆盖，请注意对比差异
 
-  # 修改所属用户
-  if [[ "$i(stat -c '%U' ${install_path})" != 'csri' ]]; then
-    chown -R csri:csri "$install_path"
-  fi
-
-  (chmod 644 -R "$install_path")
-
-  if [[ $? == 0 ]]; then
-    log_success "posidon-frontend deployed successfully"
-  else
-    log_error "posidon-frontend deployment failed"
-  fi
 }
 
 start() {
@@ -180,4 +153,14 @@ start() {
   copy_nginx_conf_and_write_verison
   add_nginx_service
   install_assets
+
+  # 修改所属用户
+  chown -R $user:$usergroup "$install_path"
+  chmod 744 -R "$install_path"
+
+  if [[ $? == 0 ]]; then
+    log_success "posidon-frontend deployed successfully"
+  else
+    log_error "posidon-frontend deployment failed"
+  fi
 }

package/dist/deploy/script/nginx.sh

@@ -7,7 +7,7 @@ nginx_conf_install_path="$prefix/opt/${app_name}/nginx/"
 pkg_path="${project_path}/pkg"
 
 # 配置文件所在路径
-new_nginx_conf_path="${pkg_path}/nginx/nginx.conf"
+new_nginx_conf_path="${pkg_path}/nginx"
 
 # nginx服务配置文件路径
 nginx_conf_path="${nginx_conf_install_path}nginx.conf"
@@ -15,20 +15,31 @@ nginx_conf_path="${nginx_conf_install_path}nginx.conf"
 # asset_path="$prefix/opt/posidon-frontend/"
 nginx_log_path="/var/log/nginx"
 nginx_log_file="${app_name}.nginx.log"
-nginx_pid_path="/var/run/${app_name}.nginx.pid"
+nginx_pid_dir="/var/run/nginx/"
+nginx_pid_file_path="$nginx_pid_dir${app_name}.nginx.pid"
 
 conf_version=$(awk '{print $1}' "${pkg_path}"/version)
 echo "$conf_version"
 
+
+
 copy_nginx_conf_and_write_verison() {
   mkdir -p "$nginx_conf_install_path"
+  #  创建pid目录
+  mkdir -p $nginx_pid_dir
+  chown -R $user:$usergroup $nginx_pid_dir
+  chmod 744 -R  $nginx_pid_dir
+
+  # 创建日志目录
+  mkdir -p $nginx_log_path
+  chown -R $user:$usergroup $nginx_log_path
+  chmod 744 -R $nginx_log_path
 
   access_log_super="access_log /dev/stdout main"
   error_log_super="error_log /dev/stderr warn"
   access_log="access_log $nginx_log_path/$nginx_log_file main"
   error_log="error_log $nginx_log_path/$nginx_log_file"
-
-  pid_file="pid  $nginx_pid_path"
+  pid_file="pid  $nginx_pid_file_path"
 
   exec=$(get_exec_path)
 
@@ -46,59 +57,62 @@ copy_nginx_conf_and_write_verison() {
   #nginx -v  nginx代码内部使用的stderr输出， 此处需要转换为stdout
   nginx_version=$($exec -v 2>&1)
 
-  cp "$new_nginx_conf_path" ./nginx.conf
+  tmp_file='./nginx/nginx.conf'
+  cp -rf "$new_nginx_conf_path" ./
 
-  sed -i "1i\# ${nginx_version}" ./nginx.conf
-  sed -i "1i\# version: ${conf_version}" ./nginx.conf
+  sed -i "1i\# ${nginx_version}" $tmp_file
+  sed -i "1i\# version: ${conf_version}" $tmp_file
 
   if [[ -n "${prefix}" ]]; then
-    n=$(grep -wn "mime.types" ./nginx.conf | awk -F: '{print $1}' | sed -n 1p)
-    sed -i "${n}c include  conf/mime.types;" ./nginx.conf
+    n=$(grep -wn "mime.types" $tmp_file | awk -F: '{print $1}' | sed -n 1p)
+    sed -i "${n}c include  conf/mime.types;" $tmp_file
   fi
 
-  # n=$(grep -wn "__root__" ./nginx.conf | awk -F: '{print $1}' | sed -n 1p)
+  # n=$(grep -wn "__root__" $tmp_file | awk -F: '{print $1}' | sed -n 1p)
   # if [[ -n "${n}" ]]; then
-  #   sed -i "${n}c root ${asset_path};" ./nginx.conf
+  #   sed -i "${n}c root ${asset_path};" $tmp_file
   # fi
 
   # 替换日志输出路径方式
-  n=$(grep -wn "#ERROR_LOG_PLACEHOLDER" ./nginx.conf | awk -F: '{print $1}' | sed -n 1p)
+  n=$(grep -wn "#ERROR_LOG_PLACEHOLDER" $tmp_file | awk -F: '{print $1}' | sed -n 1p)
   if [[ -n "${n}" ]]; then
-    if ((mode == 2)); then
-      sed -i "${n}c ${error_log};" ./nginx.conf
-    else
-      sed -i "${n}c ${error_log_super};" ./nginx.conf
-    fi
+    sed -i "${n}c ${error_log};" $tmp_file
+    # if ((mode == 2)); then
+    #   sed -i "${n}c ${error_log};" $tmp_file
+    # else
+    #   sed -i "${n}c ${error_log_super};" $tmp_file
+    # fi
   fi
 
-  n=$(grep -wn "#ACCESS_LOG_PLACEHOLDER" ./nginx.conf | awk -F: '{print $1}' | sed -n 1p)
+  n=$(grep -wn "#ACCESS_LOG_PLACEHOLDER" $tmp_file | awk -F: '{print $1}' | sed -n 1p)
   if [[ -n "${n}" ]]; then
-    if ((mode == 2)); then
-      sed -i "${n}c ${access_log};" ./nginx.conf
-    else
-      sed -i "${n}c ${access_log_super};" ./nginx.conf
-    fi
+    sed -i "${n}c ${access_log};" $tmp_file
+    # if ((mode == 2)); then
+    #   sed -i "${n}c ${access_log};" $tmp_file
+    # else
+    #   sed -i "${n}c ${access_log_super};" $tmp_file
+    # fi
   fi
 
-  n=$(grep -wn "#PID_FILE_PALCEHOLDER" ./nginx.conf | awk -F: '{print $1}' | sed -n 1p)
+  n=$(grep -wn "#PID_FILE_PALCEHOLDER" $tmp_file | awk -F: '{print $1}' | sed -n 1p)
   if [[ -n "${n}" ]]; then
+    sed -i "${n}c ${pid_file};" $tmp_file
     # 非supervisorctl
-    if ((mode == 2)); then
-      sed -i "${n}c ${pid_file};" ./nginx.conf
-    fi
+    # if ((mode == 2)); then
+    #   sed -i "${n}c ${pid_file};" $tmp_file
+    # fi
   fi
 
-  n=$(grep -wn "daemon off;" ./nginx.conf | awk -F: '{print $1}' | sed -n 1p)
+  n=$(grep -wn "daemon off;" $tmp_file | awk -F: '{print $1}' | sed -n 1p)
   if [[ -n "${n}" ]]; then
     # 非supervisorctl
     if ((mode == 2)); then
-      sed -i "${n}c daemon on;" ./nginx.conf
+      sed -i "${n}c daemon on;" $tmp_file
     fi
   fi
 
-  mv -fb "./nginx.conf" "$nginx_conf_install_path"
-
-  cp -fR "$pkg_path"/nginx/ca "$nginx_conf_install_path"
+  # 拷贝整个nginx目录
+  mv -fb ./nginx/* "$nginx_conf_install_path"
 
   mkdir -p /data/command/
   log "nginx start command: $(get_exec_cmd)"
@@ -130,19 +144,21 @@ get_exec_cmd() {
 
 add_nginx_service() {
   #添加到服务
-  exec_cmd=$(get_exec_cmd)
+  exec_cmd="$(get_exec_cmd) -e $nginx_log_path/$nginx_log_file"
   cp "$pkg_path"/nginx/nginx.service.tpl ./nginx.service
 
-  check_cmd="$exec -t -c $nginx_conf_path"
+  check_cmd="$exec -t -c $nginx_conf_path -e $nginx_log_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_log_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_path#g" ./nginx.service
-  sed -i "s#_start_check_#$check_cmd#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

package/dist/pack.js

@@ -40,12 +40,14 @@ async function pack(version) {
     fs.writeFileSync(path.resolve(nginxDir, "version"), version, { encoding: "utf-8" });
     logger.info(pc.green(`version: ${version} added`));
     const assetInstallPath = `/opt/${projectName}/`;
-    logger.info(pc.green(`start to replace __APP_NAME__ in common.sh`));
+    logger.info(pc.green(`start to replace variants in common.sh`));
     replaceFileContent({
       filePath: path.resolve(projectDir, "script", "common.sh"),
       replaced: [
         ["__APP_NAME__", `"${projectName}"`],
-        ["__INSTALL_PATH__", assetInstallPath]
+        ["__INSTALL_PATH__", assetInstallPath],
+        ["__USER__", releaseConf.user],
+        ["__USER_GROUP__", releaseConf.userGroup]
       ]
     });
     logger.info(pc.green(`start to replace version: ${version} in index.html`));
@@ -57,7 +59,7 @@ async function pack(version) {
     fs.cpSync(path.resolve(__releaseDir, "nginx"), nginxDir, { recursive: true, force: true });
     replaceFileContent({
       filePath: path.resolve(nginxDir, "nginx.conf"),
-      replaced: [["__root__", `${assetInstallPath}/assets/`]]
+      replaced: [["__root__", `${assetInstallPath}assets/`]]
       // writeToNewFilePath: path.resolve(nginxDir, `${projectName}.conf`)
     });
     logger.info(pc.green(`start to generate ${zipFileName}`));

package/dist/prepare.js

@@ -22,10 +22,14 @@ function parseConf(file) {
   }
 }
 const releaseConf = Object.assign({
+  host: "",
+  token: "",
   /** 打包脚本 默认npm run build */
   buildCmd: "npm run build",
   /** 打包后资源 相对工作区所在路径  默认dist/*/
-  assetsDir: "dist"
+  assetsDir: "dist",
+  user: "root",
+  userGroup: "root"
 }, parseConf(__releaseConfPath));
 const $ = execa({ encoding: "utf8" });
 async function prepare() {
@@ -37,13 +41,15 @@ async function prepare() {
     copyFiles();
     logger.tip(`\u8BF7\u6CE8\u610F\u4FEE\u6539.release/${releaseConfFileName} \u914D\u7F6E\u4FE1\u606F`);
   } else {
-    const shouldRegenerate = await inquirer.confirm(
-      {
-        message: ".release\u914D\u7F6E\u5DF2\u5B58\u5728\uFF0C\u662F\u5426\u91CD\u65B0\u751F\u6210\uFF1F"
+    if (!process.env.INIT_CWD) {
+      const shouldRegenerate = await inquirer.confirm(
+        {
+          message: ".release\u914D\u7F6E\u5DF2\u5B58\u5728\uFF0C\u662F\u5426\u91CD\u65B0\u751F\u6210\uFF1F"
+        }
+      );
+      if (shouldRegenerate) {
+        copyFiles();
       }
-    );
-    if (shouldRegenerate) {
-      copyFiles();
     }
   }
 }
@@ -61,14 +67,11 @@ async function checkEnvInfo() {
     logger.error(`.release\u76EE\u5F55\u4E0B\u4E0D\u5B58\u5728${releaseConfFileName}\u6587\u4EF6\uFF0C\u8BF7\u4F7F\u7528 release-helper init \u521D\u59CB\u5316\u751F\u6210`);
     process.exit(1);
   }
-  const { host, token } = releaseConf;
-  if (!host) {
-    logger.error(`The host field is required in the configuration file!`);
-    process.exit(1);
-  }
-  if (!token) {
-    logger.error(`The token field is required in the configuration file!`);
-    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);
+    }
   }
 }
 

package/package.json

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

package/src/.release/README.md

@@ -1,6 +1,52 @@
-# .release 目录说明
+# release-helper
 
-## doc 目录
+打包 和发布辅助工具, 集成nginx二进制文件，支持supervisor和systemctl启动安装模式
+
+服务器端安装和更新，请看发布后文档
+
+## 使用
+
+### 推荐
+
+在package.json中添加如下命令, 后续通过pnpm pak/pub/publish使用
+
+```bash
+  "pak": "release-helper pack",
+  "pub": "release-helper publish",
+  "release": "release-helper release",
+```
+
+### 单独使用命令
+
+请在项目根目录，使用命令
+
+#### 初始化
+
+常规来讲，通过pnpm安装时，会自动在项目根目录位置，生成.release目录，若未生成，请手动生成
+
+```bash
+release-helper init
+```
+
+#### 打包
+
+仅打包成xx.tar.gz  需指定release.conf.yaml中assetsDir字段
+
+```bash
+release-helper pack
+```
+
+#### 发版
+
+发布git release相关版本； 需指定release.conf.yaml中host等相关字段
+
+```bash
+release-helper release
+```
+
+## .release 目录说明
+
+### doc 目录
 
 用于release时附带的文档，文档中可以使用指定变量占位，后续执行release-helper release时会自动遍历，并替换所有变量
 
@@ -12,12 +58,16 @@
 | \$VERSION\$   | 用户指定的版本号                                     |
 | \$PKG_NAME\$  | tar.gz包名称（值为\$APP_NAME\$\_\$VERSION\$.tar.gz） |
 
-## nginx 目录
+### nginx 目录
 
-用于存放服务器端nginx的启动配置文件等，部分占位说明及占位符请勿删除，会在服务器端安装后更新时，由脚本自动替换
+用于存放服务器端nginx的启动配置文件等，部分占位说明及占位符请勿删除，会在服务器端安装或更新时，由脚本自动替换
 
 文件说明：
 | **文件或目录** | **说明**                                                  |
 | -------------- | --------------------------------------------------------- |
 | ca             | nginx https使用到的证书，变更时需对应修改nginx.conf中的值 |
-| nginx.conf     | nginx启动时 需要的配置文件                                |
+| nginx.conf     | nginx启动时 需要的配置文件                                |
+
+### release.conf.yaml
+
+打包发布相关配置项

package/src/.release/release.conf.yaml

@@ -1,9 +1,12 @@
-
- #gitlab 仓库地址
-host: your git repo url
-# gitlab rest api token
-token: your git token
+#gitlab 仓库地址   your git repo url
+host: ''
+# gitlab rest api token  your git token
+token: ''
 # build script   default: npm run build  
 buildCmd: "npm run build"
 # 打包后资源 相对工作区所在路径  默认dist
-assetsDir: string 
+assetsDir: 'dist' 
+
+# nginx和assets 所属用户和用户组
+user: root
+userGroup: root

package/src/deploy/nginx/script/install.sh

@@ -81,11 +81,7 @@ install() {
 
   tar -zxvhf "$pkg" -C "$install_path" --strip-components 1
 
-  mkdir -p /var/log/nginx
-
-  if [[ -z "${prefix}" ]]; then
-    cp "$install_path"/sbin/nginx /usr/sbin/
-  fi
+  cp "$install_path"nginx /usr/sbin/
 
   # 检测是否安装成功
   if [[ $? == 0 ]]; then

package/src/deploy/pkg/nginx/nginx.service.tpl

@@ -5,8 +5,8 @@ Wants=network-online.target
 
 [Service]
 # 应用启动使用的用户及用户组,需各组件手动修改
-User=root
-Group=root
+User=_user_
+Group=_user_group_
 
 Environment="LOGPATH=_log_path_" "LOGFILE=_log_file_" "LOGROTATEDELAY=2592000000"  "CONFS=_conf_path_" "VERSION=_version_"
 
@@ -22,10 +22,9 @@ WorkingDirectory=/etc/nginx
 [Service]
 Type=forking
 PIDFile=_pid_file_
-ExecStartPre=_start_check_
 ExecStart=_exec_cmd_
-ExecReload=/bin/sh -c "/bin/kill -s HUP $(/bin/cat /var/run/nginx.pid)"
-ExecStop=/bin/sh -c "/bin/kill -s TERM $(/bin/cat /var/run/nginx.pid)"
+ExecReload=/bin/sh -c "/bin/kill -s HUP $(/bin/cat _pid_file_)"
+ExecStop=/bin/sh -c "/bin/kill -s TERM $(/bin/cat _pid_file_)"
 
 PrivateTmp=true
 

package/src/deploy/script/common.sh

@@ -7,6 +7,8 @@ app_name=__APP_NAME__
 
 # 静态资源存放目录 eg: /opt/posidon-frontend/
 install_path=__INSTALL_PATH__
+user=__USER__
+usergroup=__USER_GROUP__
 
 execute_log_path="/var/log/${app_name}_script_execute_logs"
 
@@ -48,8 +50,8 @@ source "$basepath"/nginx.sh
 
 # 创建用户
 create_user_csri() {
-  user="csri"
-  group="csri"
+  user=$user
+  group=$usergroup
 
   #create group if not exists
   grep "^$group" /etc/group >&/dev/null
@@ -64,23 +66,6 @@ create_user_csri() {
   fi
 }
 
-find_nginx_pos() {
-  confpath=''
-  find / -name "nginx" -print0 >tmpfile
-  while IFS= read -r -d $'\0'; do
-    if [ -d "$REPLY/conf" ]; then # $prefix/etc/nginx
-      confpath="$REPLY/conf.d/"
-      break
-    elif [ -d "$REPLY/conf.d" ]; then # /etc/nginx
-      confpath="$REPLY/conf.d/"
-      break
-    fi
-  done <tmpfile
-  rm -f tmpfile
-
-  echo "$confpath"
-}
-
 has_nginx_installed=1
 
 # 检查 nginx 是否已安装
@@ -145,18 +130,6 @@ install_assets() {
 
   log_success "$install_path"assets/settings 已覆盖，请注意对比差异
 
-  # 修改所属用户
-  if [[ "$i(stat -c '%U' ${install_path})" != 'csri' ]]; then
-    chown -R csri:csri "$install_path"
-  fi
-
-  (chmod 644 -R "$install_path")
-
-  if [[ $? == 0 ]]; then
-    log_success "posidon-frontend deployed successfully"
-  else
-    log_error "posidon-frontend deployment failed"
-  fi
 }
 
 start() {
@@ -180,4 +153,14 @@ start() {
   copy_nginx_conf_and_write_verison
   add_nginx_service
   install_assets
+
+  # 修改所属用户
+  chown -R $user:$usergroup "$install_path"
+  chmod 744 -R "$install_path"
+
+  if [[ $? == 0 ]]; then
+    log_success "posidon-frontend deployed successfully"
+  else
+    log_error "posidon-frontend deployment failed"
+  fi
 }

package/src/deploy/script/nginx.sh

@@ -7,7 +7,7 @@ nginx_conf_install_path="$prefix/opt/${app_name}/nginx/"
 pkg_path="${project_path}/pkg"
 
 # 配置文件所在路径
-new_nginx_conf_path="${pkg_path}/nginx/nginx.conf"
+new_nginx_conf_path="${pkg_path}/nginx"
 
 # nginx服务配置文件路径
 nginx_conf_path="${nginx_conf_install_path}nginx.conf"
@@ -15,20 +15,31 @@ nginx_conf_path="${nginx_conf_install_path}nginx.conf"
 # asset_path="$prefix/opt/posidon-frontend/"
 nginx_log_path="/var/log/nginx"
 nginx_log_file="${app_name}.nginx.log"
-nginx_pid_path="/var/run/${app_name}.nginx.pid"
+nginx_pid_dir="/var/run/nginx/"
+nginx_pid_file_path="$nginx_pid_dir${app_name}.nginx.pid"
 
 conf_version=$(awk '{print $1}' "${pkg_path}"/version)
 echo "$conf_version"
 
+
+
 copy_nginx_conf_and_write_verison() {
   mkdir -p "$nginx_conf_install_path"
+  #  创建pid目录
+  mkdir -p $nginx_pid_dir
+  chown -R $user:$usergroup $nginx_pid_dir
+  chmod 744 -R  $nginx_pid_dir
+
+  # 创建日志目录
+  mkdir -p $nginx_log_path
+  chown -R $user:$usergroup $nginx_log_path
+  chmod 744 -R $nginx_log_path
 
   access_log_super="access_log /dev/stdout main"
   error_log_super="error_log /dev/stderr warn"
   access_log="access_log $nginx_log_path/$nginx_log_file main"
   error_log="error_log $nginx_log_path/$nginx_log_file"
-
-  pid_file="pid  $nginx_pid_path"
+  pid_file="pid  $nginx_pid_file_path"
 
   exec=$(get_exec_path)
 
@@ -46,59 +57,62 @@ copy_nginx_conf_and_write_verison() {
   #nginx -v  nginx代码内部使用的stderr输出， 此处需要转换为stdout
   nginx_version=$($exec -v 2>&1)
 
-  cp "$new_nginx_conf_path" ./nginx.conf
+  tmp_file='./nginx/nginx.conf'
+  cp -rf "$new_nginx_conf_path" ./
 
-  sed -i "1i\# ${nginx_version}" ./nginx.conf
-  sed -i "1i\# version: ${conf_version}" ./nginx.conf
+  sed -i "1i\# ${nginx_version}" $tmp_file
+  sed -i "1i\# version: ${conf_version}" $tmp_file
 
   if [[ -n "${prefix}" ]]; then
-    n=$(grep -wn "mime.types" ./nginx.conf | awk -F: '{print $1}' | sed -n 1p)
-    sed -i "${n}c include  conf/mime.types;" ./nginx.conf
+    n=$(grep -wn "mime.types" $tmp_file | awk -F: '{print $1}' | sed -n 1p)
+    sed -i "${n}c include  conf/mime.types;" $tmp_file
   fi
 
-  # n=$(grep -wn "__root__" ./nginx.conf | awk -F: '{print $1}' | sed -n 1p)
+  # n=$(grep -wn "__root__" $tmp_file | awk -F: '{print $1}' | sed -n 1p)
   # if [[ -n "${n}" ]]; then
-  #   sed -i "${n}c root ${asset_path};" ./nginx.conf
+  #   sed -i "${n}c root ${asset_path};" $tmp_file
   # fi
 
   # 替换日志输出路径方式
-  n=$(grep -wn "#ERROR_LOG_PLACEHOLDER" ./nginx.conf | awk -F: '{print $1}' | sed -n 1p)
+  n=$(grep -wn "#ERROR_LOG_PLACEHOLDER" $tmp_file | awk -F: '{print $1}' | sed -n 1p)
   if [[ -n "${n}" ]]; then
-    if ((mode == 2)); then
-      sed -i "${n}c ${error_log};" ./nginx.conf
-    else
-      sed -i "${n}c ${error_log_super};" ./nginx.conf
-    fi
+    sed -i "${n}c ${error_log};" $tmp_file
+    # if ((mode == 2)); then
+    #   sed -i "${n}c ${error_log};" $tmp_file
+    # else
+    #   sed -i "${n}c ${error_log_super};" $tmp_file
+    # fi
   fi
 
-  n=$(grep -wn "#ACCESS_LOG_PLACEHOLDER" ./nginx.conf | awk -F: '{print $1}' | sed -n 1p)
+  n=$(grep -wn "#ACCESS_LOG_PLACEHOLDER" $tmp_file | awk -F: '{print $1}' | sed -n 1p)
   if [[ -n "${n}" ]]; then
-    if ((mode == 2)); then
-      sed -i "${n}c ${access_log};" ./nginx.conf
-    else
-      sed -i "${n}c ${access_log_super};" ./nginx.conf
-    fi
+    sed -i "${n}c ${access_log};" $tmp_file
+    # if ((mode == 2)); then
+    #   sed -i "${n}c ${access_log};" $tmp_file
+    # else
+    #   sed -i "${n}c ${access_log_super};" $tmp_file
+    # fi
   fi
 
-  n=$(grep -wn "#PID_FILE_PALCEHOLDER" ./nginx.conf | awk -F: '{print $1}' | sed -n 1p)
+  n=$(grep -wn "#PID_FILE_PALCEHOLDER" $tmp_file | awk -F: '{print $1}' | sed -n 1p)
   if [[ -n "${n}" ]]; then
+    sed -i "${n}c ${pid_file};" $tmp_file
     # 非supervisorctl
-    if ((mode == 2)); then
-      sed -i "${n}c ${pid_file};" ./nginx.conf
-    fi
+    # if ((mode == 2)); then
+    #   sed -i "${n}c ${pid_file};" $tmp_file
+    # fi
   fi
 
-  n=$(grep -wn "daemon off;" ./nginx.conf | awk -F: '{print $1}' | sed -n 1p)
+  n=$(grep -wn "daemon off;" $tmp_file | awk -F: '{print $1}' | sed -n 1p)
   if [[ -n "${n}" ]]; then
     # 非supervisorctl
     if ((mode == 2)); then
-      sed -i "${n}c daemon on;" ./nginx.conf
+      sed -i "${n}c daemon on;" $tmp_file
     fi
   fi
 
-  mv -fb "./nginx.conf" "$nginx_conf_install_path"
-
-  cp -fR "$pkg_path"/nginx/ca "$nginx_conf_install_path"
+  # 拷贝整个nginx目录
+  mv -fb ./nginx/* "$nginx_conf_install_path"
 
   mkdir -p /data/command/
   log "nginx start command: $(get_exec_cmd)"
@@ -130,19 +144,21 @@ get_exec_cmd() {
 
 add_nginx_service() {
   #添加到服务
-  exec_cmd=$(get_exec_cmd)
+  exec_cmd="$(get_exec_cmd) -e $nginx_log_path/$nginx_log_file"
   cp "$pkg_path"/nginx/nginx.service.tpl ./nginx.service
 
-  check_cmd="$exec -t -c $nginx_conf_path"
+  check_cmd="$exec -t -c $nginx_conf_path -e $nginx_log_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_log_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_path#g" ./nginx.service
-  sed -i "s#_start_check_#$check_cmd#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

package/src/pack.ts

@@ -53,14 +53,16 @@ export async function pack(version?: string) {
     logger.info(pc.green(`version: ${version} added`))
 
     const assetInstallPath = `/opt/${projectName}/`
-    logger.info(pc.green(`start to replace __APP_NAME__ in common.sh`))
+    logger.info(pc.green(`start to replace variants in common.sh`))
 
     // 替换安装脚本 与nginx匹配的名称
     replaceFileContent({
       filePath: path.resolve(projectDir, 'script', 'common.sh'),
       replaced: [
         ['__APP_NAME__', `"${projectName}"`],
-        ['__INSTALL_PATH__', assetInstallPath]
+        ['__INSTALL_PATH__', assetInstallPath],
+        ['__USER__', releaseConf.user],
+        ['__USER_GROUP__', releaseConf.userGroup],
       ]
     })
 
@@ -79,7 +81,7 @@ export async function pack(version?: string) {
 
     replaceFileContent({
       filePath: path.resolve(nginxDir, 'nginx.conf'),
-      replaced: [['__root__', `${assetInstallPath}/assets/`]],
+      replaced: [['__root__', `${assetInstallPath}assets/`]],
       // writeToNewFilePath: path.resolve(nginxDir, `${projectName}.conf`)
     })
 

package/src/prepare.ts

@@ -17,6 +17,9 @@ export type ReleaseConf = {
   buildCmd?: string
   /** 打包后资源 相对工作区所在路径  默认dist/*/
   assetsDir?: string
+  /** nginx和assets 所属用户和用户组  默认: root*/
+  user: string
+  userGroup: string
 }
 
 // 获取项目根目录
@@ -39,10 +42,14 @@ function parseConf(file: string) {
 }
 
 export const releaseConf = Object.assign({
+  host: '',
+  token: '',
   /** 打包脚本 默认npm run build */
   buildCmd: 'npm run build',
   /** 打包后资源 相对工作区所在路径  默认dist/*/
-  assetsDir: 'dist'
+  assetsDir: 'dist',
+  user: 'root',
+  userGroup: 'root'
 }, parseConf(__releaseConfPath));
 
 export const $ = execa({ encoding: 'utf8' });
@@ -59,17 +66,18 @@ export async function prepare() {
     copyFiles();
     logger.tip(`请注意修改.release/${releaseConfFileName} 配置信息`) 
   }else {
-    
-    const shouldRegenerate = await inquirer.confirm(
-      {
-        message: '.release配置已存在，是否重新生成？',
-      },
-    ) 
-
-    if(shouldRegenerate){
-      copyFiles()
+    if(!process.env.INIT_CWD){ // Npm环境下 无法交互 会阻塞install
+      const shouldRegenerate = await inquirer.confirm(
+        {
+          message: '.release配置已存在，是否重新生成？',
+        },
+      ) 
+
+      if(shouldRegenerate){
+        copyFiles()
+      }
     }
-  }
+  } 
 }
 
 export async function checkEnvInfo() {
@@ -92,15 +100,11 @@ export async function checkEnvInfo() {
     process.exit(1);
   }
 
-  const { host, token } = releaseConf;
-  if (!host) {
-    logger.error(`The host field is required in the configuration file!`);
-    process.exit(1);
-  }
-
-  if (!token) {
-    logger.error(`The token field is required in the configuration file!`);
-    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);
+    }
   }
 }