From 5783858490fb8bdaed86c09e2c211882b513e505 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 21 Mar 2024 15:07:21 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=89=93=E5=8C=85nginx=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +-- build/debbuild/22.04/DEBIAN/postinst | 10 ++------ build/debbuild/22.04/DEBIAN/postrm | 2 +- build/debbuild/DEBIAN/postinst | 5 ---- build/rpmbuild/BUILD/etc/nginx/nginx.conf | 28 +++++++++++------------ build/rpmbuild/SPECS/omc.spec | 6 ++--- 6 files changed, 21 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 86e9ba6..44b57b4 100644 --- a/README.md +++ b/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 diff --git a/build/debbuild/22.04/DEBIAN/postinst b/build/debbuild/22.04/DEBIAN/postinst index 15e437f..dc9ee17 100644 --- a/build/debbuild/22.04/DEBIAN/postinst +++ b/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,15 +67,10 @@ 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}; + cp -f ${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 diff --git a/build/debbuild/22.04/DEBIAN/postrm b/build/debbuild/22.04/DEBIAN/postrm index 4ed7e3b..3e67391 100644 --- a/build/debbuild/22.04/DEBIAN/postrm +++ b/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 diff --git a/build/debbuild/DEBIAN/postinst b/build/debbuild/DEBIAN/postinst index 716fed4..08dfc92 100644 --- a/build/debbuild/DEBIAN/postinst +++ b/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 diff --git a/build/rpmbuild/BUILD/etc/nginx/nginx.conf b/build/rpmbuild/BUILD/etc/nginx/nginx.conf index 7144d4f..03d6c3d 100644 --- a/build/rpmbuild/BUILD/etc/nginx/nginx.conf +++ b/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. # diff --git a/build/rpmbuild/SPECS/omc.spec b/build/rpmbuild/SPECS/omc.spec index 85b6cf4..8957797 100644 --- a/build/rpmbuild/SPECS/omc.spec +++ b/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