@wjwjq/release-helper 0.1.3 → 0.1.5

package/dist/.release/doc//351/203/250/347/275/262/346/211/213/345/206/214.md

@@ -182,22 +182,31 @@ chmod +x upgrade.sh
 | 安装目录           | /opt/$APP_NAME$/                                     |
 | 版本文件           | /opt/$APP_NAME$/version                              |
 | nginx配置文件      | /opt/$APP_NAME$/nginx/nginx.conf                     |
-| 日志文件位置       | /var/log/nginx/$APP_NAME$.log                        |
+| 日志文件位置       | /var/log/$APP_NAME$/nginx.log                        |
 | 系统静态资源目录   | /opt/$APP_NAME$/assets/                              |
 | 系统配置文件       | /opt/$APP_NAME$/assets/settings                      |
 | system service位置 | /usr/lib/systemd/system/$APP_NAME$.nginx.service     |
-| supervisor启动命令 | /usr/sbin/nginx -c  /opt/$APP_NAME$/nginx/nginx.conf |
-| systemctl 启动命令 | systemctl start $APP_NAME$.nginx.service             |
+| 日志翻转配置位置 | /etc/logrotate.d/$APP_NAME$.nginx     |
 
 ## 4.2 启动命令
 
-supervisor
+### 4.2.1 原始命令
 
 ```bash
 /usr/sbin/nginx -c /opt/$APP_NAME$/nginx/nginx.conf
 ```
 
-systemctl
+### 4.2.2 supervisor
+
+需安装时选择 -standalone 模式
+
+```bash
+supervisorctl start $APP_NAME$.nginx 
+```
+
+### 4.2.3 systemctl
+
+需安装时选择 -cluster 模式
 
 ```bash
 systemctl start $APP_NAME$.nginx.service
@@ -406,21 +415,4 @@ tar: Error is not recoverable: exiting now
 
 页面配置： **最新版配置文件，请查看最新版本$APP_NAME$.tar.gz解压路径"/$APP_NAME$/pkg/assets/settings"**
 
-nginx配置： **最新版配置文件，请查看最新版本$APP_NAME$.tar.gz解压路径"/$APP_NAME$/pkg/nginx/nginx.conf"**
-
-## 5.1 v1.7.0
-
-无变更， 无需手动修改
-
-## 5.2 v1.8.0
-
-新增配置项 安全事件返回条数限制
-
-```text
-# 第5行
-systemSafeEventDate.limit=43200
-````
-
-## 5.3 v1.9.0
-
-无变更， 无需手动修改
+nginx配置： **最新版配置文件，请查看最新版本$APP_NAME$.tar.gz解压路径"/$APP_NAME$/pkg/nginx/nginx.conf"**

package/dist/.release/nginx/nginx.conf

@@ -124,7 +124,7 @@ http {
             proxy_set_header   Host             $host;
             proxy_set_header   X-Real-IP        $remote_addr;
             proxy_set_header   X-Forwarded-For  $proxy_add_x_forwarded_for;
-            proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
+            # proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
             proxy_max_temp_file_size 0;
             proxy_connect_timeout      600;
             proxy_send_timeout         600;

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

@@ -0,0 +1,14 @@
+/var/log/__app_name__/*.log {
+    daily
+    missingok
+    minsize 100M
+    rotate 3
+    compress
+    delaycompress
+    notifempty
+    create 0644 __user__ __usergroup__
+    sharedscripts
+    postrotate
+        [ -f __pid_file__ ] && kill -USR1 `cat __pid_file__`
+    endscript
+}

package/dist/deploy/script/common.sh

@@ -181,6 +181,7 @@ start() {
 
   copy_nginx_conf_and_write_verison
   add_nginx_service
+  add_log_rotate
   install_assets
 
   # 修改所属用户

package/dist/deploy/script/nginx.sh

@@ -14,32 +14,26 @@ nginx_conf_install_path="$prefix/opt/${app_name}/nginx/"
 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_info_path="/var/log/${app_name}"
+nginx_log_file="nginx.log"
 #不放在var/run 是因为重启后 var/run/下面的文件及目录会被清除
-nginx_pid_dir="/var/log/nginx/"
-nginx_pid_file_path="$nginx_pid_dir${app_name}.nginx.pid"
+nginx_pid_file_path="$nginx_info_path/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
-  touch $nginx_log_path/$nginx_log_file
-  chown -R $user:$usergroup $nginx_log_path
-  chmod 744 -R $nginx_log_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
 
   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"
+  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"
 
   exec=$(get_exec_path)
@@ -145,16 +139,16 @@ get_exec_cmd() {
 
 add_nginx_service() {
   #添加到服务
-  exec_cmd="$(get_exec_cmd) -e $nginx_log_path/$nginx_log_file"
+  exec_cmd="$(get_exec_cmd) -e $nginx_info_path/$nginx_log_file"
   cp "$pkg_path"/nginx/nginx.service.tpl ./nginx.service
 
-  check_cmd="$exec -t -c $nginx_conf_path -e $nginx_log_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_log_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
@@ -171,6 +165,21 @@ add_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
+   #添加日志翻转
+  cp "$pkg_path"/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
+  
+  cp -f ./nginx.logrotate /etc/logrotate.d/${app_name}.nginx
+}
 #------------------------------------ nginx服务配置文件服务 end----------------------------------
 
 
@@ -247,7 +256,7 @@ install_nginx_binary() {
     log_error "nginx installation failed!"
   fi
 
-  cp "$nginx_binary_install_path"sbin/nginx /usr/sbin/
+  ln -sf "$nginx_binary_install_path"sbin/nginx /usr/sbin/nginx
 
   # 修改/etc/nginx 用户(组)
   chown -R $user:$usergroup "$nginx_binary_install_path"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wjwjq/release-helper",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "generate deployment package for frontend, include nginx...",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -63,7 +63,7 @@
     "node": "^18.20.0 || >=20.0.0"
   },
   "scripts": {
-    "localpack": "pnpm link --global",
+    "localpack": "pnpm build && pnpm link --global",
     "postinstall": "node dist/start_prepare.js",
     "build": "rm -rf dist && rollup -c",
     "prepublish": "pnpm build"

package/src/.release/doc//351/203/250/347/275/262/346/211/213/345/206/214.md

@@ -182,22 +182,31 @@ chmod +x upgrade.sh
 | 安装目录           | /opt/$APP_NAME$/                                     |
 | 版本文件           | /opt/$APP_NAME$/version                              |
 | nginx配置文件      | /opt/$APP_NAME$/nginx/nginx.conf                     |
-| 日志文件位置       | /var/log/nginx/$APP_NAME$.log                        |
+| 日志文件位置       | /var/log/$APP_NAME$/nginx.log                        |
 | 系统静态资源目录   | /opt/$APP_NAME$/assets/                              |
 | 系统配置文件       | /opt/$APP_NAME$/assets/settings                      |
 | system service位置 | /usr/lib/systemd/system/$APP_NAME$.nginx.service     |
-| supervisor启动命令 | /usr/sbin/nginx -c  /opt/$APP_NAME$/nginx/nginx.conf |
-| systemctl 启动命令 | systemctl start $APP_NAME$.nginx.service             |
+| 日志翻转配置位置 | /etc/logrotate.d/$APP_NAME$.nginx     |
 
 ## 4.2 启动命令
 
-supervisor
+### 4.2.1 原始命令
 
 ```bash
 /usr/sbin/nginx -c /opt/$APP_NAME$/nginx/nginx.conf
 ```
 
-systemctl
+### 4.2.2 supervisor
+
+需安装时选择 -standalone 模式
+
+```bash
+supervisorctl start $APP_NAME$.nginx 
+```
+
+### 4.2.3 systemctl
+
+需安装时选择 -cluster 模式
 
 ```bash
 systemctl start $APP_NAME$.nginx.service
@@ -406,21 +415,4 @@ tar: Error is not recoverable: exiting now
 
 页面配置： **最新版配置文件，请查看最新版本$APP_NAME$.tar.gz解压路径"/$APP_NAME$/pkg/assets/settings"**
 
-nginx配置： **最新版配置文件，请查看最新版本$APP_NAME$.tar.gz解压路径"/$APP_NAME$/pkg/nginx/nginx.conf"**
-
-## 5.1 v1.7.0
-
-无变更， 无需手动修改
-
-## 5.2 v1.8.0
-
-新增配置项 安全事件返回条数限制
-
-```text
-# 第5行
-systemSafeEventDate.limit=43200
-````
-
-## 5.3 v1.9.0
-
-无变更， 无需手动修改
+nginx配置： **最新版配置文件，请查看最新版本$APP_NAME$.tar.gz解压路径"/$APP_NAME$/pkg/nginx/nginx.conf"**

package/src/.release/nginx/nginx.conf

@@ -124,7 +124,7 @@ http {
             proxy_set_header   Host             $host;
             proxy_set_header   X-Real-IP        $remote_addr;
             proxy_set_header   X-Forwarded-For  $proxy_add_x_forwarded_for;
-            proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
+            # proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
             proxy_max_temp_file_size 0;
             proxy_connect_timeout      600;
             proxy_send_timeout         600;

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

@@ -0,0 +1,14 @@
+/var/log/__app_name__/*.log {
+    daily
+    missingok
+    minsize 100M
+    rotate 3
+    compress
+    delaycompress
+    notifempty
+    create 0644 __user__ __usergroup__
+    sharedscripts
+    postrotate
+        [ -f __pid_file__ ] && kill -USR1 `cat __pid_file__`
+    endscript
+}

package/src/deploy/script/common.sh

@@ -181,6 +181,7 @@ start() {
 
   copy_nginx_conf_and_write_verison
   add_nginx_service
+  add_log_rotate
   install_assets
 
   # 修改所属用户

package/src/deploy/script/nginx.sh

@@ -14,32 +14,26 @@ nginx_conf_install_path="$prefix/opt/${app_name}/nginx/"
 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_info_path="/var/log/${app_name}"
+nginx_log_file="nginx.log"
 #不放在var/run 是因为重启后 var/run/下面的文件及目录会被清除
-nginx_pid_dir="/var/log/nginx/"
-nginx_pid_file_path="$nginx_pid_dir${app_name}.nginx.pid"
+nginx_pid_file_path="$nginx_info_path/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
-  touch $nginx_log_path/$nginx_log_file
-  chown -R $user:$usergroup $nginx_log_path
-  chmod 744 -R $nginx_log_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
 
   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"
+  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"
 
   exec=$(get_exec_path)
@@ -145,16 +139,16 @@ get_exec_cmd() {
 
 add_nginx_service() {
   #添加到服务
-  exec_cmd="$(get_exec_cmd) -e $nginx_log_path/$nginx_log_file"
+  exec_cmd="$(get_exec_cmd) -e $nginx_info_path/$nginx_log_file"
   cp "$pkg_path"/nginx/nginx.service.tpl ./nginx.service
 
-  check_cmd="$exec -t -c $nginx_conf_path -e $nginx_log_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_log_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
@@ -171,6 +165,21 @@ add_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
+   #添加日志翻转
+  cp "$pkg_path"/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
+  
+  cp -f ./nginx.logrotate /etc/logrotate.d/${app_name}.nginx
+}
 #------------------------------------ nginx服务配置文件服务 end----------------------------------
 
 
@@ -247,7 +256,7 @@ install_nginx_binary() {
     log_error "nginx installation failed!"
   fi
 
-  cp "$nginx_binary_install_path"sbin/nginx /usr/sbin/
+  ln -sf "$nginx_binary_install_path"sbin/nginx /usr/sbin/nginx
 
   # 修改/etc/nginx 用户(组)
   chown -R $user:$usergroup "$nginx_binary_install_path"