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

fix: remove kvdb installation

Browse Source
This commit is contained in:
simonzhangsz
2024-07-23 19:00:54 +08:00
parent 5902ba2f51
commit 8c2e7957d9
2 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
debbuild/22.04/DEBIAN/postinst
View File

@@ -57,61 +57,61 @@ for CFile in ${CFileList}; do
fi fi
done done
# Install redis db if not exist /usr/local/db # # Install redis db if not exist /usr/local/db
if [ ! -e "${RedisRootDir}/bin/kvdb-server" ]; then # if [ ! -e "${RedisRootDir}/bin/kvdb-server" ]; then
# if [ ! -e "${RedisRootDir}" ]; then # # if [ ! -e "${RedisRootDir}" ]; then
# mkdir -p ${RedisRootDir} # # mkdir -p ${RedisRootDir}
# fi # # fi
# stop old adb service # # stop old adb service
if [ -e "${RedisOldRootDir}/bin/redis-server" ] && [ -e "${SystemdRootDir}/adb.service" ]; then # if [ -e "${RedisOldRootDir}/bin/redis-server" ] && [ -e "${SystemdRootDir}/adb.service" ]; then
systemctl stop adb.service # systemctl stop adb.service
systemctl disable adb.service # systemctl disable adb.service
fi # fi
# stop adb service # # stop adb service
if [ -e "${UsrLocalBinDir}/adb-server" ] && [ -e "${SystemdRootDir}/adb.service" ]; then # if [ -e "${UsrLocalBinDir}/adb-server" ] && [ -e "${SystemdRootDir}/adb.service" ]; then
systemctl stop adb.service # systemctl stop adb.service
systemctl disable adb.service # systemctl disable adb.service
fi # fi
cp -rf ${DependsRootDir}/kvdb/* / # cp -rf ${DependsRootDir}/kvdb/* /
chmod +rx ${RedisRootDir}/bin/kvdb* # chmod +rx ${RedisRootDir}/bin/kvdb*
if [ ! -e "${RedisConfDir}/kvdb.conf" ]; then # if [ ! -e "${RedisConfDir}/kvdb.conf" ]; then
cp ${RedisConfDir}/default/kvdb.conf ${RedisConfDir} # cp ${RedisConfDir}/default/kvdb.conf ${RedisConfDir}
fi # fi
sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/kvdb.conf # sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/kvdb.conf
LINE="masterauth helloearth" # LINE="masterauth helloearth"
FILE="${RedisConfDir}/kvdb.conf" # FILE="${RedisConfDir}/kvdb.conf"
# 检查文件中是否存在该行 # # 检查文件中是否存在该行
if ! grep -qxF "$LINE" "$FILE"; then # if ! grep -qxF "$LINE" "$FILE"; then
# 如果不存在，将其添加到文件末尾 # # 如果不存在，将其添加到文件末尾
echo "$LINE" >> "$FILE" # echo "$LINE" >> "$FILE"
fi # fi
# copy the old adb dump.rdb # # copy the old adb dump.rdb
if [ -e "${RedisOldRootDir}/bin/conf/dump.rdb" ] && [ ! -e "${RedisRootDir}/etc/kvdb/dump.rdb" ]; then # if [ -e "${RedisOldRootDir}/bin/conf/dump.rdb" ] && [ ! -e "${RedisRootDir}/etc/kvdb/dump.rdb" ]; then
cp -f ${RedisOldRootDir}/bin/conf/dump.rdb ${RedisRootDir}/etc/kvdb/; # cp -f ${RedisOldRootDir}/bin/conf/dump.rdb ${RedisRootDir}/etc/kvdb/;
mv -f ${RedisRootDir}/db ${RedisRootDir}/adb.old # mv -f ${RedisRootDir}/db ${RedisRootDir}/adb.old
fi # fi
# copy the adb dump.rdb # # copy the adb dump.rdb
if [ -e "${RedisRootDir}/etc/adb/dump.rdb" ] && [ ! -e "${RedisRootDir}/etc/kvdb/dump.rdb" ]; then # if [ -e "${RedisRootDir}/etc/adb/dump.rdb" ] && [ ! -e "${RedisRootDir}/etc/kvdb/dump.rdb" ]; then
cp -f ${RedisRootDir}/etc/adb/dump.rdb ${RedisRootDir}/etc/kvdb/; # cp -f ${RedisRootDir}/etc/adb/dump.rdb ${RedisRootDir}/etc/kvdb/;
mv -f ${RedisRootDir}/etc/adb ${RedisRootDir}/etc/adb.old # mv -f ${RedisRootDir}/etc/adb ${RedisRootDir}/etc/adb.old
fi # fi
# cp -f ${DependsRootDir}/systemd/kvdb.service ${SystemdRootDir} # # cp -f ${DependsRootDir}/systemd/kvdb.service ${SystemdRootDir}
else # else
if [ ! -e "${RedisConfDir}/kvdb.conf" ]; then # if [ ! -e "${RedisConfDir}/kvdb.conf" ]; then
cp ${RedisConfDir}/default/kvdb.conf ${RedisConfDir} # cp ${RedisConfDir}/default/kvdb.conf ${RedisConfDir}
fi # fi
sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/kvdb.conf # sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/kvdb.conf
LINE="masterauth helloearth" # LINE="masterauth helloearth"
FILE="${RedisConfDir}/kvdb.conf" # FILE="${RedisConfDir}/kvdb.conf"
# 检查文件中是否存在该行 # # 检查文件中是否存在该行
if ! grep -qxF "$LINE" "$FILE"; then # if ! grep -qxF "$LINE" "$FILE"; then
# 如果不存在，将其添加到文件末尾 # # 如果不存在，将其添加到文件末尾
echo "$LINE" >> "$FILE" # echo "$LINE" >> "$FILE"
fi # fi
fi # fi
if [ ! -e "${FERootDir}/config.js" ]; then if [ ! -e "${FERootDir}/config.js" ]; then
cp ${FERootDir}/default/config.js ${FERootDir}; cp ${FERootDir}/default/config.js ${FERootDir};
@@ -144,16 +144,16 @@ systemctl enable restagent.service
systemctl enable crontask.service systemctl enable crontask.service
systemctl enable sshsvc.service systemctl enable sshsvc.service
systemctl enable captrace.service systemctl enable captrace.service
systemctl enable kvdb.service #systemctl enable kvdb.service
systemctl daemon-reload systemctl daemon-reload
systemctl stop nginx.service #systemctl stop nginx.service
systemctl stop restagent.service systemctl stop restagent.service
systemctl stop crontask.service systemctl stop crontask.service
systemctl stop sshsvc.service systemctl stop sshsvc.service
systemctl stop captrace.service systemctl stop captrace.service
systemctl stop kvdb.service #systemctl stop kvdb.service
systemctl start nginx.service #systemctl start nginx.service
systemctl start kvdb.service #systemctl start kvdb.service
systemctl start crontask.service systemctl start crontask.service
systemctl start sshsvc.service systemctl start sshsvc.service
systemctl start captrace.service systemctl start captrace.service

114
debbuild/DEBIAN/postinst
View File

@@ -57,61 +57,61 @@ for CFile in ${CFileList}; do
fi fi
done done
# Install redis db if not exist /usr/local/db # # Install redis db if not exist /usr/local/db
if [ ! -e "${RedisRootDir}/bin/kvdb-server" ]; then # if [ ! -e "${RedisRootDir}/bin/kvdb-server" ]; then
# if [ ! -e "${RedisRootDir}" ]; then # # if [ ! -e "${RedisRootDir}" ]; then
# mkdir -p ${RedisRootDir} # # mkdir -p ${RedisRootDir}
# fi # # fi
# stop old adb service # # stop old adb service
if [ -e "${RedisOldRootDir}/bin/redis-server" ] && [ -e "${SystemdRootDir}/adb.service" ]; then # if [ -e "${RedisOldRootDir}/bin/redis-server" ] && [ -e "${SystemdRootDir}/adb.service" ]; then
systemctl stop adb.service # systemctl stop adb.service
systemctl disable adb.service # systemctl disable adb.service
fi # fi
# stop adb service # # stop adb service
if [ -e "${UsrLocalBinDir}/adb-server" ] && [ -e "${SystemdRootDir}/adb.service" ]; then # if [ -e "${UsrLocalBinDir}/adb-server" ] && [ -e "${SystemdRootDir}/adb.service" ]; then
systemctl stop adb.service # systemctl stop adb.service
systemctl disable adb.service # systemctl disable adb.service
fi # fi
cp -rf ${DependsRootDir}/kvdb/* / # cp -rf ${DependsRootDir}/kvdb/* /
chmod +rx ${RedisRootDir}/bin/kvdb* # chmod +rx ${RedisRootDir}/bin/kvdb*
if [ ! -e "${RedisConfDir}/kvdb.conf" ]; then # if [ ! -e "${RedisConfDir}/kvdb.conf" ]; then
cp ${RedisConfDir}/default/kvdb.conf ${RedisConfDir}; # cp ${RedisConfDir}/default/kvdb.conf ${RedisConfDir};
fi # fi
sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/kvdb.conf # sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/kvdb.conf
LINE="masterauth helloearth" # LINE="masterauth helloearth"
FILE="${RedisConfDir}/kvdb.conf" # FILE="${RedisConfDir}/kvdb.conf"
# 检查文件中是否存在该行 # # 检查文件中是否存在该行
if ! grep -qxF "$LINE" "$FILE"; then # if ! grep -qxF "$LINE" "$FILE"; then
# 如果不存在，将其添加到文件末尾 # # 如果不存在，将其添加到文件末尾
echo "$LINE" >> "$FILE" # echo "$LINE" >> "$FILE"
fi # fi
# copy the old adb dump.rdb # # copy the old adb dump.rdb
if [ -e "${RedisOldRootDir}/bin/conf/dump.rdb" ] && [ ! -e "${RedisConfDir}/dump.rdb" ]; then # if [ -e "${RedisOldRootDir}/bin/conf/dump.rdb" ] && [ ! -e "${RedisConfDir}/dump.rdb" ]; then
cp -f ${RedisOldRootDir}/bin/conf/dump.rdb ${RedisConfDir}; # cp -f ${RedisOldRootDir}/bin/conf/dump.rdb ${RedisConfDir};
mv -f ${RedisRootDir}/db ${RedisRootDir}/adb.old # mv -f ${RedisRootDir}/db ${RedisRootDir}/adb.old
fi # fi
# copy the adb dump.rdb # # copy the adb dump.rdb
if [ -e "${RedisRootDir}/etc/adb/dump.rdb" ] && [ ! -e "${RedisRootDir}/etc/kvdb/dump.rdb" ]; then # if [ -e "${RedisRootDir}/etc/adb/dump.rdb" ] && [ ! -e "${RedisRootDir}/etc/kvdb/dump.rdb" ]; then
cp -f ${RedisRootDir}/etc/adb/dump.rdb ${RedisRootDir}/etc/kvdb/; # cp -f ${RedisRootDir}/etc/adb/dump.rdb ${RedisRootDir}/etc/kvdb/;
mv -f ${RedisRootDir}/etc/adb ${RedisRootDir}/etc/adb.old # mv -f ${RedisRootDir}/etc/adb ${RedisRootDir}/etc/adb.old
fi # fi
# cp -f ${DependsRootDir}/systemd/kvdb.service ${SystemdRootDir} # # cp -f ${DependsRootDir}/systemd/kvdb.service ${SystemdRootDir}
else # else
if [ ! -e "${RedisConfDir}/kvdb.conf" ]; then # if [ ! -e "${RedisConfDir}/kvdb.conf" ]; then
cp ${RedisConfDir}/default/kvdb.conf ${RedisConfDir} # cp ${RedisConfDir}/default/kvdb.conf ${RedisConfDir}
fi # fi
sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/kvdb.conf # sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/kvdb.conf
LINE="masterauth helloearth" # LINE="masterauth helloearth"
FILE="${RedisConfDir}/kvdb.conf" # FILE="${RedisConfDir}/kvdb.conf"
# 检查文件中是否存在该行 # # 检查文件中是否存在该行
if ! grep -qxF "$LINE" "$FILE"; then # if ! grep -qxF "$LINE" "$FILE"; then
# 如果不存在，将其添加到文件末尾 # # 如果不存在，将其添加到文件末尾
echo "$LINE" >> "$FILE" # echo "$LINE" >> "$FILE"
fi # fi
fi # fi
if [ ! -e "${FERootDir}/config.js" ]; then if [ ! -e "${FERootDir}/config.js" ]; then
cp ${FERootDir}/default/config.js ${FERootDir}; cp ${FERootDir}/default/config.js ${FERootDir};
@@ -144,16 +144,16 @@ systemctl enable restagent.service
systemctl enable crontask.service systemctl enable crontask.service
systemctl enable sshsvc.service systemctl enable sshsvc.service
systemctl enable captrace.service systemctl enable captrace.service
systemctl enable kvdb.service #systemctl enable kvdb.service
systemctl daemon-reload systemctl daemon-reload
systemctl stop nginx.service #systemctl stop nginx.service
systemctl stop restagent.service systemctl stop restagent.service
systemctl stop crontask.service systemctl stop crontask.service
systemctl stop sshsvc.service systemctl stop sshsvc.service
systemctl stop captrace.service systemctl stop captrace.service
systemctl stop kvdb.service #systemctl stop kvdb.service
systemctl start nginx.service #systemctl start nginx.service
systemctl start kvdb.service #systemctl start kvdb.service
systemctl start crontask.service systemctl start crontask.service
systemctl start sshsvc.service systemctl start sshsvc.service
systemctl start captrace.service systemctl start captrace.service