fix: remove kvdb installation
This commit is contained in:
@@ -57,61 +57,61 @@ for CFile in ${CFileList}; do
|
||||
fi
|
||||
done
|
||||
|
||||
# Install redis db if not exist /usr/local/db
|
||||
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
|
||||
# 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}/kvdb.conf
|
||||
# # Install redis db if not exist /usr/local/db
|
||||
# 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
|
||||
# # 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}/kvdb.conf
|
||||
|
||||
LINE="masterauth helloearth"
|
||||
FILE="${RedisConfDir}/kvdb.conf"
|
||||
# 检查文件中是否存在该行
|
||||
if ! grep -qxF "$LINE" "$FILE"; then
|
||||
# 如果不存在，将其添加到文件末尾
|
||||
echo "$LINE" >> "$FILE"
|
||||
fi
|
||||
# LINE="masterauth helloearth"
|
||||
# FILE="${RedisConfDir}/kvdb.conf"
|
||||
# # 检查文件中是否存在该行
|
||||
# if ! grep -qxF "$LINE" "$FILE"; then
|
||||
# # 如果不存在，将其添加到文件末尾
|
||||
# echo "$LINE" >> "$FILE"
|
||||
# fi
|
||||
|
||||
# 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
|
||||
# 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
|
||||
# # 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
|
||||
# # 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}/kvdb.conf"
|
||||
# 检查文件中是否存在该行
|
||||
if ! grep -qxF "$LINE" "$FILE"; then
|
||||
# 如果不存在，将其添加到文件末尾
|
||||
echo "$LINE" >> "$FILE"
|
||||
fi
|
||||
fi
|
||||
# LINE="masterauth helloearth"
|
||||
# FILE="${RedisConfDir}/kvdb.conf"
|
||||
# # 检查文件中是否存在该行
|
||||
# if ! grep -qxF "$LINE" "$FILE"; then
|
||||
# # 如果不存在，将其添加到文件末尾
|
||||
# echo "$LINE" >> "$FILE"
|
||||
# fi
|
||||
# fi
|
||||
|
||||
if [ ! -e "${FERootDir}/config.js" ]; then
|
||||
cp ${FERootDir}/default/config.js ${FERootDir};
|
||||
@@ -144,16 +144,16 @@ systemctl enable restagent.service
|
||||
systemctl enable crontask.service
|
||||
systemctl enable sshsvc.service
|
||||
systemctl enable captrace.service
|
||||
systemctl enable kvdb.service
|
||||
#systemctl enable kvdb.service
|
||||
systemctl daemon-reload
|
||||
systemctl stop nginx.service
|
||||
#systemctl stop nginx.service
|
||||
systemctl stop restagent.service
|
||||
systemctl stop crontask.service
|
||||
systemctl stop sshsvc.service
|
||||
systemctl stop captrace.service
|
||||
systemctl stop kvdb.service
|
||||
systemctl start nginx.service
|
||||
systemctl start kvdb.service
|
||||
#systemctl stop kvdb.service
|
||||
#systemctl start nginx.service
|
||||
#systemctl start kvdb.service
|
||||
systemctl start crontask.service
|
||||
systemctl start sshsvc.service
|
||||
systemctl start captrace.service
|
||||
|
||||
@@ -57,61 +57,61 @@ for CFile in ${CFileList}; do
|
||||
fi
|
||||
done
|
||||
|
||||
# Install redis db if not exist /usr/local/db
|
||||
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
|
||||
# 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}/kvdb.conf
|
||||
# # Install redis db if not exist /usr/local/db
|
||||
# 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
|
||||
# # 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}/kvdb.conf
|
||||
|
||||
LINE="masterauth helloearth"
|
||||
FILE="${RedisConfDir}/kvdb.conf"
|
||||
# 检查文件中是否存在该行
|
||||
if ! grep -qxF "$LINE" "$FILE"; then
|
||||
# 如果不存在，将其添加到文件末尾
|
||||
echo "$LINE" >> "$FILE"
|
||||
fi
|
||||
# LINE="masterauth helloearth"
|
||||
# FILE="${RedisConfDir}/kvdb.conf"
|
||||
# # 检查文件中是否存在该行
|
||||
# if ! grep -qxF "$LINE" "$FILE"; then
|
||||
# # 如果不存在，将其添加到文件末尾
|
||||
# echo "$LINE" >> "$FILE"
|
||||
# fi
|
||||
|
||||
# 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
|
||||
# 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
|
||||
# # 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
|
||||
# # 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}/kvdb.conf"
|
||||
# 检查文件中是否存在该行
|
||||
if ! grep -qxF "$LINE" "$FILE"; then
|
||||
# 如果不存在，将其添加到文件末尾
|
||||
echo "$LINE" >> "$FILE"
|
||||
fi
|
||||
fi
|
||||
# LINE="masterauth helloearth"
|
||||
# FILE="${RedisConfDir}/kvdb.conf"
|
||||
# # 检查文件中是否存在该行
|
||||
# if ! grep -qxF "$LINE" "$FILE"; then
|
||||
# # 如果不存在，将其添加到文件末尾
|
||||
# echo "$LINE" >> "$FILE"
|
||||
# fi
|
||||
# fi
|
||||
|
||||
if [ ! -e "${FERootDir}/config.js" ]; then
|
||||
cp ${FERootDir}/default/config.js ${FERootDir};
|
||||
@@ -144,16 +144,16 @@ systemctl enable restagent.service
|
||||
systemctl enable crontask.service
|
||||
systemctl enable sshsvc.service
|
||||
systemctl enable captrace.service
|
||||
systemctl enable kvdb.service
|
||||
#systemctl enable kvdb.service
|
||||
systemctl daemon-reload
|
||||
systemctl stop nginx.service
|
||||
#systemctl stop nginx.service
|
||||
systemctl stop restagent.service
|
||||
systemctl stop crontask.service
|
||||
systemctl stop sshsvc.service
|
||||
systemctl stop captrace.service
|
||||
systemctl stop kvdb.service
|
||||
systemctl start nginx.service
|
||||
systemctl start kvdb.service
|
||||
#systemctl stop kvdb.service
|
||||
#systemctl start nginx.service
|
||||
#systemctl start kvdb.service
|
||||
systemctl start crontask.service
|
||||
systemctl start sshsvc.service
|
||||
systemctl start captrace.service
|
||||
|
||||
Reference in New Issue
Block a user