@wjwjq/release-helper 0.1.2 → 0.1.4

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

@@ -186,18 +186,26 @@ chmod +x upgrade.sh
 | 系统静态资源目录   | /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             |
 
 ## 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

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_binary/compile.sh

@@ -6,7 +6,7 @@
   --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/nginx.pid \
+  --pid-path=/var/run/nginx.pid \
   --lock-path=/var/run/nginx/nginx.lock \
   --with-http_ssl_module \
   --with-http_v2_module \
@@ -32,6 +32,8 @@ if [[ -z "${ssl_version}" ]]; then
   ssl_version="1.0.2"
 fi
 
-tar -zcvf nginx-"$arch"-ssl"$ssl_version".tar.gz /etc/nginx/ -C /root
+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/nginx.sh

@@ -16,7 +16,8 @@ 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_dir="/var/run/nginx/"
+#不放在var/run 是因为重启后 var/run/下面的文件及目录会被清除
+nginx_pid_dir="/var/log/nginx/"
 nginx_pid_file_path="$nginx_pid_dir${app_name}.nginx.pid"
 
 conf_version=$(awk '{print $1}' "${pkg_path}"/version)

package/package.json

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

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

@@ -186,18 +186,26 @@ chmod +x upgrade.sh
 | 系统静态资源目录   | /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             |
 
 ## 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

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_binary/compile.sh

@@ -6,7 +6,7 @@
   --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/nginx.pid \
+  --pid-path=/var/run/nginx.pid \
   --lock-path=/var/run/nginx/nginx.lock \
   --with-http_ssl_module \
   --with-http_v2_module \
@@ -32,6 +32,8 @@ if [[ -z "${ssl_version}" ]]; then
   ssl_version="1.0.2"
 fi
 
-tar -zcvf nginx-"$arch"-ssl"$ssl_version".tar.gz /etc/nginx/ -C /root
+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/src/deploy/script/nginx.sh

@@ -16,7 +16,8 @@ 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_dir="/var/run/nginx/"
+#不放在var/run 是因为重启后 var/run/下面的文件及目录会被清除
+nginx_pid_dir="/var/log/nginx/"
 nginx_pid_file_path="$nginx_pid_dir${app_name}.nginx.pid"
 
 conf_version=$(awk '{print $1}' "${pkg_path}"/version)