From 603a50e038faf4698fac4fd7508fd08e5e439626 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Fri, 10 Nov 2023 14:37:31 +0800
Subject: [PATCH] fix: nginx default server port 80

---
 debbuild/22.04/DEBIAN/postinst | 6 +++++-
 debbuild/DEBIAN/postinst       | 6 +++++-
 docs/release note.txt          | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debbuild/22.04/DEBIAN/postinst b/debbuild/22.04/DEBIAN/postinst
index dcc9eed..1a265b1 100644
--- a/debbuild/22.04/DEBIAN/postinst
+++ b/debbuild/22.04/DEBIAN/postinst
@@ -69,7 +69,11 @@ if [ ! -e "${NginxConfDir}/omc.conf" ]; then
     mkdir -p ${NginxConfDir}    
     cp -f ${OMCEtcDir}/nginx/omc.conf ${NginxConfDir}; 
 fi
-cp -f ${OMCEtcDir}/nginx/default ${NginxSiteAvailable}
+#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 
 sudo systemctl stop nginx.service 
 sudo systemctl stop restagent.service
 sudo systemctl stop crontask.service
diff --git a/debbuild/DEBIAN/postinst b/debbuild/DEBIAN/postinst
index 10180e2..9b0ed44 100644
--- a/debbuild/DEBIAN/postinst
+++ b/debbuild/DEBIAN/postinst
@@ -69,7 +69,11 @@ if [ ! -e "${NginxConfDir}/omc.conf" ]; then
     mkdir -p ${NginxConfDir}
     cp -f ${OMCEtcDir}/nginx/omc.conf ${NginxConfDir}; 
 fi
-cp -f ${OMCEtcDir}/nginx/default ${NginxSiteAvailable}
+#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 
 sudo systemctl stop nginx.service 
 sudo systemctl stop restagent.service
 sudo systemctl stop crontask.service
diff --git a/docs/release note.txt b/docs/release note.txt
index a5ac25c..624b57e 100644
--- a/docs/release note.txt	
+++ b/docs/release note.txt	
@@ -217,5 +217,5 @@
 1.修复了终端的UDM签约数据导入导出问题
 2.修复MML命令add authdata的ki参数无法输入字母，将int类型改为string类型
 3.用户导入导出写反了
-4.OMC Web端口增加80不通过nginx，原有8888仍可访问（通过nginx）
+4.OMC Web浏览端口增加80(不通过nginx), 原有8888仍可访问(通过nginx)
 5.参数重载移到网元操作
\ No newline at end of file