diff --git a/debbuild/22.04/DEBIAN/postinst b/debbuild/22.04/DEBIAN/postinst index 5ddc009..5c0d48e 100644 --- a/debbuild/22.04/DEBIAN/postinst +++ b/debbuild/22.04/DEBIAN/postinst @@ -1,15 +1,16 @@ # !/bin/bash RedisRootDir=/usr/local +OMCRootDir=/usr/local/omc RedisOldRootDir=/usr/local/db -RedisConfDir=${RedisRootDir}/etc/adb -DependsRootDir=/usr/local/omc/depends +RedisConfDir=${RedisRootDir}/etc/kvdb +DependsRootDir=${OMCRootDir}/depends SystemdRootDir=/lib/systemd/system -OMCEtcDir=/usr/local/omc/etc -FERootDir=/usr/local/omc/htdocs/front +OMCEtcDir=${OMCRootDir}/etc +FERootDir=${OMCRootDir}/htdocs/front X86Lib64Dir=/lib/x86_64-linux-gnu -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 @@ -24,7 +25,7 @@ echo " sudo systemctl start/stop/restart/status restagent.service" echo " sudo systemctl start/stop/restart/status crontask.service" echo " sudo systemctl start/stop/restart/status sshsvc.service" echo " sudo systemctl start/stop/restart/status captrace.service" -echo " sudo systemctl start/stop/restart/status adb.service" +echo " sudo systemctl start/stop/restart/status kvdb.service" echo " or run: " echo " sudo /usr/local/omc/bin/omcsvc.sh start/stop/restart/status" echo "" @@ -42,10 +43,10 @@ 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 -chmod +rx /usr/local/omc/bin/* -chmod +rx /usr/local/omc/* -chmod +rx /usr/local/bin/* -chmod -R 755 /usr/local/omc/htdocs/front +chmod +rx ${OMCRootDir}/bin/* +chmod +rx ${OMCRootDir}/* +chmod +rx ${UsrLocalBinDir}/* +chmod -R 755 ${OMCRootDir}/htdocs/front for CFile in ${CFileList}; do if [ ! -e "${OMCEtcDir}/${CFile}" ]; then @@ -57,42 +58,54 @@ for CFile in ${CFileList}; do done # Install redis db if not exist /usr/local/db -if [ ! -e "${RedisRootDir}/bin/adb-server" ]; then +if [ ! -e "${RedisRootDir}/bin/kvdb-server" ]; then # if [ ! -e "${RedisRootDir}" ]; then # mkdir -p ${RedisRootDir} # fi + # stop old adb service if [ -e "${RedisOldRootDir}/bin/redis-server" ] && [ -e "${SystemdRootDir}/adb.service" ]; then systemctl stop adb.service + systemctl disable adb.service fi - cp -rf ${DependsRootDir}/adb/* / - chmod +rx ${RedisRootDir}/bin/* - if [ ! -e "${RedisConfDir}/adb.conf" ]; then - cp ${RedisConfDir}/default/adb.conf ${RedisConfDir} + # stop adb service + if [ -e "${UsrLocalBinDir}/adb-server" ] && [ -e "${SystemdRootDir}/adb.service" ]; then + systemctl stop adb.service + systemctl disable adb.service + fi + cp -rf ${DependsRootDir}/kvdb/* / + chmod +rx ${RedisRootDir}/bin/kvdb* + 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}/adb.conf + 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" fi - # copy the orangin dump.rdb - if [ -e "${RedisOldRootDir}/bin/conf/dump.rdb" ]; then - cp -f ${RedisOldRootDir}/bin/conf/dump.rdb ${RedisConfDir} + # copy the old adb dump.rdb + if [ -e "${RedisOldRootDir}/bin/conf/dump.rdb" ] && [ ! -e "${RedisRootDir}/etc/kvdb/dump.rdb" ]; then + cp -f ${RedisOldRootDir}/bin/conf/dump.rdb ${RedisRootDir}/etc/kvdb/; mv -f ${RedisRootDir}/db ${RedisRootDir}/adb.old - fi -# cp -f ${DependsRootDir}/systemd/adb.service ${SystemdRootDir} -else - if [ ! -e "${RedisConfDir}/adb.conf" ]; then - cp ${RedisConfDir}/default/adb.conf ${RedisConfDir} fi - sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/adb.conf + # copy the adb dump.rdb + if [ -e "${RedisRootDir}/etc/adb/dump.rdb" ] && [ ! -e "${RedisRootDir}/etc/kvdb/dump.rdb" ]; then + cp -f ${RedisRootDir}/etc/adb/dump.rdb ${RedisRootDir}/etc/kvdb/; + mv -f ${RedisRootDir}/etc/adb ${RedisRootDir}/etc/adb.old + fi +# cp -f ${DependsRootDir}/systemd/kvdb.service ${SystemdRootDir} +else + 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 # 如果不存在,将其添加到文件末尾 @@ -131,16 +144,16 @@ 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 daemon-reload systemctl stop nginx.service systemctl stop restagent.service systemctl stop crontask.service systemctl stop sshsvc.service systemctl stop captrace.service -systemctl stop adb.service +systemctl stop kvdb.service systemctl start nginx.service -systemctl start adb.service +systemctl start kvdb.service systemctl start crontask.service systemctl start sshsvc.service systemctl start captrace.service diff --git a/debbuild/22.04/DEBIAN/postrm b/debbuild/22.04/DEBIAN/postrm index d624e93..27a324e 100644 --- a/debbuild/22.04/DEBIAN/postrm +++ b/debbuild/22.04/DEBIAN/postrm @@ -13,14 +13,15 @@ systemctl stop restagent.service systemctl stop crontask.service systemctl stop sshsvc.service systemctl stop captrace.service -systemctl stop adb.service +#systemctl stop kvdb.service #rm -rf /usr/local/omc rm -rf /etc/nginx/conf.d/omc.conf +rm -f /usr/local/bin/omcd systemctl disable restagent.service systemctl disable crontask.service systemctl disable sshsvc.service systemctl disable captrace.service -systemctl disable adb.service +#systemctl disable kvdb.service systemctl daemon-reload \ No newline at end of file diff --git a/debbuild/DEBIAN/postinst b/debbuild/DEBIAN/postinst index 202a2a7..31cb0c9 100644 --- a/debbuild/DEBIAN/postinst +++ b/debbuild/DEBIAN/postinst @@ -1,15 +1,16 @@ # !/bin/bash RedisRootDir=/usr/local +OMCRootDir=/usr/local/omc RedisOldRootDir=/usr/local/db -RedisConfDir=${RedisRootDir}/etc/adb -DependsRootDir=/usr/local/omc/depends +RedisConfDir=${RedisRootDir}/etc/kvdb +DependsRootDir=${OMCRootDir}/depends SystemdRootDir=/lib/systemd/system -OMCEtcDir=/usr/local/omc/etc -FERootDir=/usr/local/omc/htdocs/front +OMCEtcDir=${OMCRootDir}/etc +FERootDir=${OMCRootDir}/htdocs/front X86Lib64Dir=/lib/x86_64-linux-gnu -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 @@ -24,7 +25,7 @@ echo " sudo systemctl start/stop/restart/status restagent.service" echo " sudo systemctl start/stop/restart/status crontask.service" echo " sudo systemctl start/stop/restart/status sshsvc.service" echo " sudo systemctl start/stop/restart/status captrace.service" -echo " sudo systemctl start/stop/restart/status adb.service" +echo " sudo systemctl start/stop/restart/status kvdb.service" echo " or run: " echo " sudo /usr/local/omc/bin/omcsvc.sh start/stop/restart/status" echo "" @@ -42,10 +43,10 @@ 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 -chmod +rx /usr/local/omc/bin/* -chmod +rx /usr/local/omc/* -chmod +rx /usr/local/bin/* -chmod -R 755 /usr/local/omc/htdocs/front +chmod +rx ${OMCRootDir}/bin/* +chmod +rx ${OMCRootDir}/* +chmod +rx ${UsrLocalBinDir}/* +chmod -R 755 ${OMCRootDir}/htdocs/front for CFile in ${CFileList}; do if [ ! -e "${OMCEtcDir}/${CFile}" ]; then @@ -57,42 +58,54 @@ for CFile in ${CFileList}; do done # Install redis db if not exist /usr/local/db -if [ ! -e "${RedisRootDir}/bin/adb-server" ]; then +if [ ! -e "${RedisRootDir}/bin/kvdb-server" ]; then # if [ ! -e "${RedisRootDir}" ]; then # mkdir -p ${RedisRootDir} # fi + # stop old adb service if [ -e "${RedisOldRootDir}/bin/redis-server" ] && [ -e "${SystemdRootDir}/adb.service" ]; then systemctl stop adb.service + systemctl disable adb.service fi - cp -rf ${DependsRootDir}/adb/* / - chmod +rx ${RedisRootDir}/bin/* - if [ ! -e "${RedisConfDir}/adb.conf" ]; then - cp ${RedisConfDir}/default/adb.conf ${RedisConfDir}; + # stop adb service + if [ -e "${UsrLocalBinDir}/adb-server" ] && [ -e "${SystemdRootDir}/adb.service" ]; then + systemctl stop adb.service + systemctl disable adb.service + fi + cp -rf ${DependsRootDir}/kvdb/* / + chmod +rx ${RedisRootDir}/bin/kvdb* + 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}/adb.conf + 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" fi - # copy the orangin dump.rdb - if [ -e "${RedisOldRootDir}/bin/conf/dump.rdb" ]; then + # copy the old adb dump.rdb + if [ -e "${RedisOldRootDir}/bin/conf/dump.rdb" ] && [ ! -e "${RedisConfDir}/dump.rdb" ]; then cp -f ${RedisOldRootDir}/bin/conf/dump.rdb ${RedisConfDir}; mv -f ${RedisRootDir}/db ${RedisRootDir}/adb.old - fi -# cp -f ${DependsRootDir}/systemd/adb.service ${SystemdRootDir} -else - if [ ! -e "${RedisConfDir}/adb.conf" ]; then - cp ${RedisConfDir}/default/adb.conf ${RedisConfDir} fi - sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/adb.conf + # copy the adb dump.rdb + if [ -e "${RedisRootDir}/etc/adb/dump.rdb" ] && [ ! -e "${RedisRootDir}/etc/kvdb/dump.rdb" ]; then + cp -f ${RedisRootDir}/etc/adb/dump.rdb ${RedisRootDir}/etc/kvdb/; + mv -f ${RedisRootDir}/etc/adb ${RedisRootDir}/etc/adb.old + fi +# cp -f ${DependsRootDir}/systemd/kvdb.service ${SystemdRootDir} +else + 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 # 如果不存在,将其添加到文件末尾 @@ -131,16 +144,16 @@ 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 daemon-reload systemctl stop nginx.service systemctl stop restagent.service systemctl stop crontask.service systemctl stop sshsvc.service systemctl stop captrace.service -systemctl stop adb.service +systemctl stop kvdb.service systemctl start nginx.service -systemctl start adb.service +systemctl start kvdb.service systemctl start crontask.service systemctl start sshsvc.service systemctl start captrace.service diff --git a/debbuild/DEBIAN/postrm b/debbuild/DEBIAN/postrm index d624e93..27a324e 100644 --- a/debbuild/DEBIAN/postrm +++ b/debbuild/DEBIAN/postrm @@ -13,14 +13,15 @@ systemctl stop restagent.service systemctl stop crontask.service systemctl stop sshsvc.service systemctl stop captrace.service -systemctl stop adb.service +#systemctl stop kvdb.service #rm -rf /usr/local/omc rm -rf /etc/nginx/conf.d/omc.conf +rm -f /usr/local/bin/omcd systemctl disable restagent.service systemctl disable crontask.service systemctl disable sshsvc.service systemctl disable captrace.service -systemctl disable adb.service +#systemctl disable kvdb.service systemctl daemon-reload \ No newline at end of file