OMC/build.ems
1
0
Fork 0
Code Issues Activity

fix: web port change to 80,443

Browse Source
This commit is contained in:
simonzhangsz
2023-11-09 18:08:32 +08:00
parent 94988d48a1
commit ddb1761f0a
4 changed files with 61 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
debbuild/22.04/DEBIAN/postinst
View File

@@ -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

23
debbuild/DEBIAN/postinst
View File

@@ -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

4
docs/release note.txt
View File

@@ -214,4 +214,6 @@
4.安全-用户管理：operator登录账号改成manager,密码manager.其他默认账号提供密码。
2023.11.9
1.修复了终端的UDM签约数据导入导出问题
1.修复了终端的UDM签约数据导入导出问题
2.修复MML命令add authdata的ki参数无法输入字母，将int类型改为string类型
3.用户导入导出写反了

44
rpmbuild/SPECS/omc.spec
View File

@@ -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