fix: kvdb install for arm64

rpmbuild/SPECS/omc.spec

@@ -33,7 +33,7 @@ cd ${RPM_BUILD_ROOT}
 cp -rf ${RPM_BUILD_DIR}/* ${RPM_BUILD_ROOT}/
 chmod +rx ${RPM_BUILD_ROOT}/usr/local/omc 
 chmod +rx ${RPM_BUILD_ROOT}/usr/local/omc/*
-chmod +rx ${RPM_BUILD_ROOT}/usr/local/db/bin/*
+# chmod +rx ${RPM_BUILD_ROOT}/usr/local/db/bin/*
 chmod +rx ${RPM_BUILD_ROOT}/usr/local/bin/*
 chmod -R 755 ${RPM_BUILD_ROOT}/usr/local/omc/htdocs/front
 chmod +rx ${RPM_BUILD_ROOT}/usr/lib64/*
@@ -55,7 +55,7 @@ chmod +rx ${RPM_BUILD_ROOT}/usr/lib64/*
 #cp -f systemd/crontask.service ${RPM_BUILD_ROOT}/lib/systemd/system/crontask.service
 #cp -f systemd/sshsvc.service ${RPM_BUILD_ROOT}/lib/systemd/system/sshsvc.service
 #cp -f systemd/captrace.service ${RPM_BUILD_ROOT}/lib/systemd/system/captrace.service
-#cp -f systemd/adb.service ${RPM_BUILD_ROOT}/lib/systemd/system/adb.service
+#cp -f systemd/kvdb.service ${RPM_BUILD_ROOT}/lib/systemd/system/kvdb.service
 
 %build
 #cd %{buildroot}/..
@@ -63,7 +63,10 @@ chmod +rx ${RPM_BUILD_ROOT}/usr/lib64/*
 
 # 安装完成后执行
 %post
-RedisConfDir=/usr/local/db/bin/conf
+OmcRootDir=/usr/local/omc
+DependDir=${OmcRootDir}/depends
+RedisBinDir=/usr/local/bin
+RedisConfDir=/usr/local/etc/kvdb
 OMCEtcDir=/usr/local/omc/etc
 FERootDir=/usr/local/omc/htdocs/front
 UsrLib64Dir=/usr/lib64
@@ -82,13 +85,19 @@ for CFile in ${CFileList}; do
         cp -f ${OMCEtcDir}/default/${CFile} ${OMCEtcDir}
     fi                                
 done
-if [ ! -e "${RedisConfDir}/adb.conf" ]; then    
-    cp ${RedisConfDir}/default/adb.conf ${RedisConfDir}; 
+
+# Check if install kvdb
+if [ ! -e "${RedisBinDir}/kvdb_server" ]; then
+    cp -rf ${DependDir}/kvdb/*  /
 fi
-sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/adb.conf 
+
+if [ ! -e "${RedisConfDir}/kvdb.conf" ]; then    
+    cp ${RedisConfDir}/default/kvdb.conf ${RedisConfDir}; 
+fi
+sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/kvdb.conf 
 
 LINE="masterauth helloearth"
-FILE="${RedisConfDir}/adb.conf"
+FILE="${RedisConfDir}/kvdb.conf"
 if ! grep -qxF "$LINE" "$FILE"; then
     # 如果不存在，将其添加到文件末尾
      echo "$LINE" >> "$FILE"
@@ -117,22 +126,22 @@ if [ ! -e libwsutil.so.13 ]; then  ln -s libwsutil.so.13.1.0 libwsutil.so.13; fi
 if [ ! -e libwsutil.so ]; then  ln -s libwsutil.so.13.1.0 libwsutil.so; fi
 cd ${UsrLocalBinDir}
 if [ ! -e ${OmcDaemon} ]; then  ln -s ${OmcBinDir}/omcsvc.sh ${OmcDaemon}; fi
-sed -i 's/listen       80;/listen       1080;/g' ${NginxEtcDir}/nginx.conf
-sed -i 's/listen       \[::\]:80;/listen       \[::\]:1080;/g' ${NginxEtcDir}/nginx.conf 
+# sed -i 's/listen       80;/listen       1080;/g' ${NginxEtcDir}/nginx.conf
+# sed -i 's/listen       \[::\]:80;/listen       \[::\]:1080;/g' ${NginxEtcDir}/nginx.conf 
 systemctl daemon-reload
 systemctl enable restagent.service
 systemctl enable crontask.service
 systemctl enable sshsvc.service
 systemctl enable captrace.service
-systemctl enable adb.service
+systemctl enable kvdb.service
 systemctl stop restagent.service
 systemctl stop crontask.service
 systemctl stop sshsvc.service
 systemctl stop captrace.service
-systemctl stop nginx.service
-systemctl stop adb.service
-systemctl start adb.service
-systemctl start nginx.service
+# systemctl stop nginx.service
+systemctl stop kvdb.service
+systemctl start kvdb.service
+# systemctl start nginx.service
 systemctl start captrace.service
 systemctl start sshsvc.service
 systemctl start crontask.service
@@ -153,26 +162,26 @@ 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 
+sudo systemctl stop kvdb.service
+#sudo systemctl stop nginx.service 
 #rm -rf /usr/local/omc
 rm -rf /etc/nginx/conf.d/omc.conf
 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 disable kvdb.service
 sudo systemctl daemon-reload
 else
 sudo systemctl daemon-reload
-sudo systemctl stop nginx.service 
+#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 stop kvdb.service 
+#sudo systemctl start nginx.service
+sudo systemctl start kvdb.service
 sudo systemctl start crontask.service
 sudo systemctl start sshsvc.service
 sudo systemctl start captrace.service
@@ -196,13 +205,12 @@ fi
 /usr/local/omc/database
 /usr/local/omc/static
 /usr/local/omc/depends
-/usr/local/db
-/etc/nginx/conf.d/omc.conf
+#/etc/nginx/conf.d/omc.conf
 /lib/systemd/system/restagent.service
 /lib/systemd/system/crontask.service
 /lib/systemd/system/sshsvc.service
 /lib/systemd/system/captrace.service
-/lib/systemd/system/adb.service
+#/lib/systemd/system/kvdb.service
 /usr/lib64/libwireshark.so.15.0.12
 /usr/lib64/libwiretap.so.12.0.12
 /usr/lib64/libwsutil.so.13.1.0