From ddb1761f0a9d40c7e01e373bd7c85637adb3bce6 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Thu, 9 Nov 2023 18:08:32 +0800
Subject: [PATCH] fix: web port change to 80,443

---
 debbuild/22.04/DEBIAN/postinst | 23 ++++++++++++------
 debbuild/DEBIAN/postinst       | 23 ++++++++++++------
 docs/release note.txt          |  4 +++-
 rpmbuild/SPECS/omc.spec        | 44 ++++++++++++++++++++--------------
 4 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/debbuild/22.04/DEBIAN/postinst b/debbuild/22.04/DEBIAN/postinst
index e5ae80a..dcc9eed 100644
--- a/debbuild/22.04/DEBIAN/postinst
+++ b/debbuild/22.04/DEBIAN/postinst
@@ -7,7 +7,9 @@ X86Lib64Dir=/lib/x86_64-linux-gnu
 OmcBinDir=/usr/local/omc/bin
 UsrLocalBinDir=/usr/local/bin
 OmcDaemon=omcd
-NginxConfDir=/etc/nginx/conf.d
+NginxEtcDir=/etc/nginx
+NginxConfDir=${NginxEtcDir}/conf.d
+NginxSiteAvailable=${NginxEtcDir}/sites-available
 CFileList="restconf.yaml crontask.yaml tasks.yaml sshsvc.yaml capconf.yaml"
 
 echo ""
@@ -67,10 +69,17 @@ if [ ! -e "${NginxConfDir}/omc.conf" ]; then
     mkdir -p ${NginxConfDir}    
     cp -f ${OMCEtcDir}/nginx/omc.conf ${NginxConfDir}; 
 fi
-sudo systemctl restart nginx.service 
-sudo systemctl restart adb.service
-sudo systemctl restart restagent.service
-sudo systemctl restart crontask.service
-sudo systemctl restart sshsvc.service
-sudo systemctl restart captrace.service
+cp -f ${OMCEtcDir}/nginx/default ${NginxSiteAvailable}
+sudo systemctl stop nginx.service 
+sudo systemctl stop restagent.service
+sudo systemctl stop crontask.service
+sudo systemctl stop sshsvc.service
+sudo systemctl stop captrace.service
+sudo systemctl stop adb.service 
+sudo systemctl start nginx.service
+sudo systemctl start adb.service
+sudo systemctl start crontask.service
+sudo systemctl start sshsvc.service
+sudo systemctl start captrace.service
+sudo systemctl start restagent.service
 
diff --git a/debbuild/DEBIAN/postinst b/debbuild/DEBIAN/postinst
index ae6a4d2..10180e2 100644
--- a/debbuild/DEBIAN/postinst
+++ b/debbuild/DEBIAN/postinst
@@ -7,7 +7,9 @@ X86Lib64Dir=/lib/x86_64-linux-gnu
 OmcBinDir=/usr/local/omc/bin
 UsrLocalBinDir=/usr/local/bin
 OmcDaemon=omcd
-NginxConfDir=/etc/nginx/conf.d
+NginxEtcDir=/etc/nginx
+NginxConfDir=${NginxEtcDir}/conf.d
+NginxSiteAvailable=${NginxEtcDir}/sites-available
 CFileList="restconf.yaml crontask.yaml tasks.yaml sshsvc.yaml capconf.yaml"
 
 echo ""
@@ -67,10 +69,17 @@ if [ ! -e "${NginxConfDir}/omc.conf" ]; then
     mkdir -p ${NginxConfDir}
     cp -f ${OMCEtcDir}/nginx/omc.conf ${NginxConfDir}; 
 fi
-sudo systemctl restart nginx.service 
-sudo systemctl restart adb.service
-sudo systemctl restart restagent.service
-sudo systemctl restart crontask.service
-sudo systemctl restart sshsvc.service
-sudo systemctl restart captrace.service
+cp -f ${OMCEtcDir}/nginx/default ${NginxSiteAvailable}
+sudo systemctl stop nginx.service 
+sudo systemctl stop restagent.service
+sudo systemctl stop crontask.service
+sudo systemctl stop sshsvc.service
+sudo systemctl stop captrace.service
+sudo systemctl stop adb.service 
+sudo systemctl start nginx.service
+sudo systemctl start adb.service
+sudo systemctl start crontask.service
+sudo systemctl start sshsvc.service
+sudo systemctl start captrace.service
+sudo systemctl start restagent.service
 
diff --git a/docs/release note.txt b/docs/release note.txt
index 68f36a6..c59c9a9 100644
--- a/docs/release note.txt	
+++ b/docs/release note.txt	
@@ -214,4 +214,6 @@
 4.安全-用户管理：operator登录账号改成manager,密码manager.其他默认账号提供密码。
 
 2023.11.9
-1.修复了终端的UDM签约数据导入导出问题
\ No newline at end of file
+1.修复了终端的UDM签约数据导入导出问题
+2.修复MML命令add authdata的ki参数无法输入字母，将int类型改为string类型
+3.用户导入导出写反了
\ No newline at end of file
diff --git a/rpmbuild/SPECS/omc.spec b/rpmbuild/SPECS/omc.spec
index 4a80f79..a041b6c 100644
--- a/rpmbuild/SPECS/omc.spec
+++ b/rpmbuild/SPECS/omc.spec
@@ -117,27 +117,34 @@ rm libwiretap.so
 rm libwsutil.so.13
 rm libwsutil.so
 if [ "$1" = "0" ] ; then
-systemctl stop restagent.service
-systemctl stop crontask.service
-systemctl stop sshsvc.service
-systemctl stop captrace.service
-systemctl stop adb.service
+sudo systemctl stop restagent.service
+sudo systemctl stop crontask.service
+sudo systemctl stop sshsvc.service
+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
-systemctl disable restagent.service
-systemctl disable crontask.service
-systemctl disable sshsvc.service
-systemctl disable captrace.service
-systemctl disable adb.service
-systemctl daemon-reload
+sudo systemctl disable restagent.service
+sudo systemctl disable crontask.service
+sudo systemctl disable sshsvc.service
+sudo systemctl disable captrace.service
+sudo systemctl disable adb.service
+sudo systemctl daemon-reload
 else
-systemctl daemon-reload
-systemctl restart adb.service
-systemctl restart nginx.service
-systemctl restart restagent.service
-systemctl restart crontask.service
-systemctl restart sshsvc.service
-systemctl restart captrace.service
+sudo systemctl daemon-reload
+sudo systemctl stop nginx.service 
+sudo systemctl stop restagent.service
+sudo systemctl stop crontask.service
+sudo systemctl stop sshsvc.service
+sudo systemctl stop captrace.service
+sudo systemctl stop adb.service 
+sudo systemctl start nginx.service
+sudo systemctl start adb.service
+sudo systemctl start crontask.service
+sudo systemctl start sshsvc.service
+sudo systemctl start captrace.service
+sudo systemctl start restagent.service
 fi
 
 # 规定那些文件必须放入安装程序中，如果没有就报错
@@ -157,6 +164,7 @@ fi
 /usr/local/omc/database
 /usr/local/db
 /etc/nginx/conf.d/omc.conf
+/etc/nginx/sites-available/default
 /lib/systemd/system/restagent.service
 /lib/systemd/system/crontask.service
 /lib/systemd/system/sshsvc.service