chore: 打包nginx配置

README.md

@@ -52,8 +52,7 @@ go build -o omc -v -ldflags "-X 'nms_cxy/lib/global.Version=2.2311.8' -X 'nms_cx
 
 ```sh
 # 可执行
-chmod +x build.sh
-./build.sh deb
+chmod +x build.sh && ./build.sh deb
 
 # 卸载程序
 dpkg -r omc

build/debbuild/22.04/DEBIAN/postinst

@@ -10,7 +10,6 @@ UsrLocalBinDir=/usr/local/bin
 OmcDaemon=omcd
 NginxEtcDir=/etc/nginx
 NginxConfDir=${NginxEtcDir}/conf.d
-NginxSiteAvailable=${NginxEtcDir}/sites-available
 CFileList="omc.yaml crontask.yaml tasks.yaml sshsvc.yaml capconf.yaml"
 LogoFileList="zh_brand.png zh_icon.png en_brand.png en_icon.png"
 
@@ -68,14 +67,9 @@ if ! id -u omc >/dev/null 2>&1 ; then
 else 
     echo "user omc exist"; 
 fi
-if [ ! -e "${NginxConfDir}/omc.conf" ]; then
+if [ ! -e "${NginxConfDir}/default.conf" ]; then
     mkdir -p ${NginxConfDir}    
-    cp -f ${OMCEtcDir}/nginx/omc.conf ${NginxConfDir}; 
-fi
-#cp -f ${OMCEtcDir}/nginx/default ${NginxSiteAvailable}
-if [ -e "${NginxSiteAvailable}/default" ]; then
-    sed -i 's/listen 80 default_server;/listen 1080 default_server;/g' ${NginxSiteAvailable}/default
-    sed -i 's/listen \[::\]:80 default_server;/listen \[::\]:1080 default_server;/g' ${NginxSiteAvailable}/default
+    cp -f ${OMCEtcDir}/nginx/default.conf ${NginxConfDir}; 
 fi
 systemctl enable omc.service
 systemctl enable crontask.service

build/debbuild/22.04/DEBIAN/postrm

@@ -16,7 +16,7 @@ systemctl stop captrace.service
 systemctl stop adb.service
 
 #rm -rf /usr/local/omc
-rm -rf /etc/nginx/conf.d/omc.conf
+rm -rf /etc/nginx/conf.d/default.conf
 
 systemctl disable omc.service
 systemctl disable crontask.service

build/debbuild/DEBIAN/postinst

@@ -71,11 +71,6 @@ if [ ! -e "${NginxConfDir}/default.conf" ]; then
     mkdir -p ${NginxConfDir}
     cp -rf ${OMCEtcDir}/nginx/default.conf ${NginxConfDir}; 
 fi
-#cp -f ${OMCEtcDir}/nginx/default ${NginxSiteAvailable}
-# if [ -e "${NginxSiteAvailable}/default" ]; then
-#     sed -i 's/listen 80 default_server;/listen 1080 default_server;/g' ${NginxSiteAvailable}/default
-#     sed -i 's/listen \[::\]:80 default_server;/listen \[::\]:1080 default_server;/g' ${NginxSiteAvailable}/default
-# fi 
 systemctl enable omc.service
 systemctl enable crontask.service
 systemctl enable sshsvc.service

build/rpmbuild/BUILD/etc/nginx/nginx.conf

@@ -35,23 +35,23 @@ http {
     # for more information.
     include /etc/nginx/conf.d/*.conf;
 
-    server {
-        listen       1080;
-        listen       [::]:1080;
-        server_name  _;
-        root         /usr/share/nginx/html;
+    # server {
+    #     listen       1080;
+    #     listen       [::]:1080;
+    #     server_name  _;
+    #     root         /usr/share/nginx/html;
 
-        # Load configuration files for the default server block.
-        include /etc/nginx/default.d/*.conf;
+    #     # Load configuration files for the default server block.
+    #     include /etc/nginx/default.d/*.conf;
 
-        error_page 404 /404.html;
-            location = /40x.html {
-        }
+    #     error_page 404 /404.html;
+    #         location = /40x.html {
+    #     }
 
-        error_page 500 502 503 504 /50x.html;
-            location = /50x.html {
-        }
-    }
+    #     error_page 500 502 503 504 /50x.html;
+    #         location = /50x.html {
+    #     }
+    # }
 
 # Settings for a TLS enabled server.
 #

build/rpmbuild/SPECS/omc.spec

@@ -50,7 +50,7 @@ chmod +rx ${RPM_BUILD_ROOT}/usr/lib64/*
 #cp -rf omc/license ${RPM_BUILD_ROOT}/usr/local/omc/
 #cp -rf omc/database ${RPM_BUILD_ROOT}/usr/local/omc/
 #cp -rf db/* ${RPM_BUILD_ROOT}/usr/local/db/
-#cp -f nginx/omc.conf ${RPM_BUILD_ROOT}/etc/nginx/conf.d/
+#cp -f nginx/default.conf ${RPM_BUILD_ROOT}/etc/nginx/conf.d/
 #cp -f systemd/omc.service ${RPM_BUILD_ROOT}/lib/systemd/system/omc.service
 #cp -f systemd/crontask.service ${RPM_BUILD_ROOT}/lib/systemd/system/crontask.service
 #cp -f systemd/sshsvc.service ${RPM_BUILD_ROOT}/lib/systemd/system/sshsvc.service
@@ -146,7 +146,7 @@ sudo systemctl stop captrace.service
 sudo systemctl stop adb.service
 sudo systemctl stop nginx.service 
 #rm -rf /usr/local/omc
-rm -rf /etc/nginx/conf.d/omc.conf
+rm -rf /etc/nginx/conf.d/default.conf
 sudo systemctl disable omc.service
 sudo systemctl disable crontask.service
 sudo systemctl disable sshsvc.service
@@ -186,7 +186,7 @@ fi
 /usr/local/omc/database
 /usr/local/omc/static
 /usr/local/db
-/etc/nginx/conf.d/omc.conf
+/etc/nginx/conf.d/default.conf
 /lib/systemd/system/omc.service
 /lib/systemd/system/crontask.service
 /lib/systemd/system/sshsvc.service