From ff0f52efac0e3e7f62fda2393b79e461ffb7e961 Mon Sep 17 00:00:00 2001 From: zhangsz Date: Tue, 17 Jun 2025 09:57:45 +0800 Subject: [PATCH] fix: ... --- debbuild/22.04/DEBIAN/postinst | 6 +++--- debbuild/22.04/DEBIAN/postrm | 2 +- debbuild/DEBIAN/postinst | 6 +++--- debbuild/DEBIAN/postrm | 2 +- rpmbuild/SPECS/omc.spec | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/debbuild/22.04/DEBIAN/postinst b/debbuild/22.04/DEBIAN/postinst index 26ded25..56ae131 100755 --- a/debbuild/22.04/DEBIAN/postinst +++ b/debbuild/22.04/DEBIAN/postinst @@ -7,7 +7,7 @@ FERootDir=${OMCRootDir}/htdocs/front OmcBinDir=${OMCRootDir}/bin OMCStaticDir=${OMCRootDir}/static UsrLocalBinDir=/usr/local/bin -OmcDaemon=psapd +OmcDaemon=omcd NginxEtcDir=/etc/nginx NginxConfDir=${NginxEtcDir}/conf.d CFileList="restconf.yaml sshsvc.yaml omc.conf" @@ -18,11 +18,11 @@ echo "* To start/stop/restart/status omc service, please run:" echo " sudo systemctl start/stop/restart/status restagent.service" echo " sudo systemctl start/stop/restart/status sshsvc.service" echo " or run: " -echo " sudo /usr/local/omc/bin/psapsvc.sh start/stop/restart/status" +echo " sudo /usr/local/omc/bin/omcsvc.sh start/stop/restart/status" echo "" cd ${UsrLocalBinDir} -if [ ! -e ${OmcDaemon} ]; then ln -s ${OmcBinDir}/psapsvc.sh ${OmcDaemon}; fi +if [ ! -e ${OmcDaemon} ]; then ln -s ${OmcBinDir}/omcsvc.sh ${OmcDaemon}; fi chmod +rx ${OMCRootDir}/bin/* chmod +rx ${OMCRootDir}/* diff --git a/debbuild/22.04/DEBIAN/postrm b/debbuild/22.04/DEBIAN/postrm index 74d908d..4fbf476 100755 --- a/debbuild/22.04/DEBIAN/postrm +++ b/debbuild/22.04/DEBIAN/postrm @@ -2,7 +2,7 @@ #rm -rf /usr/local/omc rm -rf /etc/nginx/conf.d/omc.conf -rm -f /usr/local/bin/psapd +rm -f /usr/local/bin/omcd systemctl daemon-reload diff --git a/debbuild/DEBIAN/postinst b/debbuild/DEBIAN/postinst index 2a9d682..aefd385 100644 --- a/debbuild/DEBIAN/postinst +++ b/debbuild/DEBIAN/postinst @@ -7,7 +7,7 @@ FERootDir=${OMCRootDir}/htdocs/front OmcBinDir=${OMCRootDir}/bin OMCStaticDir=${OMCRootDir}/static UsrLocalBinDir=/usr/local/bin -OmcDaemon=psapd +OmcDaemon=omcd NginxEtcDir=/etc/nginx NginxConfDir=${NginxEtcDir}/conf.d CFileList="restconf.yaml sshsvc.yaml omc.conf" @@ -18,11 +18,11 @@ echo "* To start/stop/restart/status omc service, please run:" echo " sudo systemctl start/stop/restart/status restagent.service" echo " sudo systemctl start/stop/restart/status sshsvc.service" echo " or run: " -echo " sudo /usr/local/omc/bin/psapsvc.sh start/stop/restart/status" +echo " sudo /usr/local/omc/bin/omcsvc.sh start/stop/restart/status" echo "" cd ${UsrLocalBinDir} -if [ ! -e ${OmcDaemon} ]; then ln -s ${OmcBinDir}/psapsvc.sh ${OmcDaemon}; fi +if [ ! -e ${OmcDaemon} ]; then ln -s ${OmcBinDir}/omcsvc.sh ${OmcDaemon}; fi chmod +rx ${OMCRootDir}/bin/* chmod +rx ${OMCRootDir}/* diff --git a/debbuild/DEBIAN/postrm b/debbuild/DEBIAN/postrm index 74d908d..4fbf476 100644 --- a/debbuild/DEBIAN/postrm +++ b/debbuild/DEBIAN/postrm @@ -2,7 +2,7 @@ #rm -rf /usr/local/omc rm -rf /etc/nginx/conf.d/omc.conf -rm -f /usr/local/bin/psapd +rm -f /usr/local/bin/omcd systemctl daemon-reload diff --git a/rpmbuild/SPECS/omc.spec b/rpmbuild/SPECS/omc.spec index ff32354..4616c53 100644 --- a/rpmbuild/SPECS/omc.spec +++ b/rpmbuild/SPECS/omc.spec @@ -36,7 +36,7 @@ FERootDir=${OMCRootDir}/htdocs/front OMCBinDir=${OMCRootDir}/bin OMCStaticDir=${OMCRootDir}/static UsrLocalBinDir=/usr/local/bin -OMCDaemon=psapd +OMCDaemon=omcd NginxEtcDir=/etc/nginx CFileList="restconf.yaml sshsvc.yaml omc.conf" LogoFileList="zh_brand.png zh_icon.png en_brand.png en_icon.png" @@ -68,7 +68,7 @@ if ! id -u omc >/dev/null 2>&1 ; then useradd -d /opt/omc -m -s /bin/bash -p mkdir -p /opt/omc/ftp mkdir -p /opt/omc/ftp/log cd ${UsrLocalBinDir} -if [ ! -e ${OMCDaemon} ]; then ln -s ${OMCBinDir}/psapsvc.sh ${OMCDaemon}; fi +if [ ! -e ${OMCDaemon} ]; then ln -s ${OMCBinDir}/omcsvc.sh ${OMCDaemon}; fi # setting firewall PortList="80 443 44080 44443 33030 22222" @@ -105,7 +105,7 @@ echo "done" # 卸载时执行 %postun UsrLocalBinDir=/usr/local/bin -rm -f ${UsrLocalBinDir}/psapd +rm -f ${UsrLocalBinDir}/omcd # setting firewall PortList="80 443 44080 44443 33030 22222"