From df3b72268040a3415aefa1ec54f908e0e1dfa42a Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Tue, 9 Jul 2024 10:36:54 +0800 Subject: [PATCH] fix: kvdb issue --- .../{system/systemd => systemd/system}/kvdb.service | 0 rpmbuild/SPECS/omc.spec | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) rename rpmbuild/BUILD/usr/local/omc/depends/kvdb/usr/lib/{system/systemd => systemd/system}/kvdb.service (100%) diff --git a/rpmbuild/BUILD/usr/local/omc/depends/kvdb/usr/lib/system/systemd/kvdb.service b/rpmbuild/BUILD/usr/local/omc/depends/kvdb/usr/lib/systemd/system/kvdb.service similarity index 100% rename from rpmbuild/BUILD/usr/local/omc/depends/kvdb/usr/lib/system/systemd/kvdb.service rename to rpmbuild/BUILD/usr/local/omc/depends/kvdb/usr/lib/systemd/system/kvdb.service diff --git a/rpmbuild/SPECS/omc.spec b/rpmbuild/SPECS/omc.spec index 6709a96..747cf8c 100644 --- a/rpmbuild/SPECS/omc.spec +++ b/rpmbuild/SPECS/omc.spec @@ -64,14 +64,14 @@ chmod +rx ${RPM_BUILD_ROOT}/usr/lib64/* # 安装完成后执行 %post OmcRootDir=/usr/local/omc -DependDir=${OmcRootDir}/depends +DependsRootDir=${OmcRootDir}/depends RedisBinDir=/usr/local/bin RedisConfDir=/usr/local/etc/kvdb -OMCEtcDir=/usr/local/omc/etc -FERootDir=/usr/local/omc/htdocs/front +OMCEtcDir=${OmcRootDir}/etc +FERootDir=${OmcRootDir}/htdocs/front UsrLib64Dir=/usr/lib64 -OmcBinDir=/usr/local/omc/bin -OMCStaticDir=/usr/local/omc/static +OmcBinDir=${OmcRootDir}/bin +OMCStaticDir=${OmcRootDir}/static UsrLocalBinDir=/usr/local/bin OmcDaemon=omcd NginxEtcDir=/etc/nginx @@ -88,7 +88,7 @@ done # Check if install kvdb if [ ! -e "${RedisBinDir}/kvdb_server" ]; then - cp -rf ${DependDir}/kvdb/* / + cp -rf ${DependsRootDir}/kvdb/* / chmod 755 ${RedisBinDir}/kvdb* fi