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

fix: adb conf issue

Browse Source
This commit is contained in:
simonzhangsz
2024-04-25 14:13:58 +08:00
parent dd315bf439
commit ee3e8b8032
5 changed files with 69 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
debbuild/22.04/DEBIAN/postinst
View File

@@ -68,15 +68,40 @@ if [ ! -e "${RedisRootDir}/bin/adb-server" ]; then
chmod +rx ${RedisRootDir}/bin/*
if [ ! -e "${RedisConfDir}/adb.conf" ]; then
cp ${RedisConfDir}/default/adb.conf ${RedisConfDir}
else
sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/adb.conf
fi
sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/adb.conf
# 要检查的行
LINE="masterauth helloearth"
# 文件路径
FILE="${RedisConfDir}/adb.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}
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
# 要检查的行
LINE="masterauth helloearth"
# 文件路径
FILE="${RedisConfDir}/adb.conf"
# 检查文件中是否存在该行
if ! grep -qxF "$LINE" "$FILE"; then
# 如果不存在，将其添加到文件末尾
echo "$LINE" >> "$FILE"
fi
fi
if [ ! -e "${FERootDir}/config.js" ]; then

3
debbuild/22.04/usr/local/omc/depends/adb/usr/local/etc/adb/default/adb.conf
View File

@@ -2083,4 +2083,5 @@ replica-weighting-factor 2
# blob-support false
# set slave of UDM primary redis
slaveof 172.16.5.140 6379
slaveof 172.16.5.140 6379
masterauth helloearth

3
debbuild/22.04/usr/local/omc/depends/adb/usr/local/etc/adb/default/adb.conf_dual
View File

@@ -2086,4 +2086,5 @@ replica-weighting-factor 2
# blob-support false
# set slave of UDM primary redis
slaveof 172.16.5.140 6379
slaveof 172.16.5.140 6379
masterauth helloearth

29
debbuild/DEBIAN/postinst
View File

@@ -68,15 +68,40 @@ if [ ! -e "${RedisRootDir}/bin/adb-server" ]; then
chmod +rx ${RedisRootDir}/bin/*
if [ ! -e "${RedisConfDir}/adb.conf" ]; then
cp ${RedisConfDir}/default/adb.conf ${RedisConfDir};
else
sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/adb.conf
fi
sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/adb.conf
# 要检查的行
LINE="masterauth helloearth"
# 文件路径
FILE="${RedisConfDir}/adb.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};
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
# 要检查的行
LINE="masterauth helloearth"
# 文件路径
FILE="${RedisConfDir}/adb.conf"
# 检查文件中是否存在该行
if ! grep -qxF "$LINE" "$FILE"; then
# 如果不存在，将其添加到文件末尾
echo "$LINE" >> "$FILE"
fi
fi
if [ ! -e "${FERootDir}/config.js" ]; then

15
rpmbuild/SPECS/omc.spec
View File

@@ -82,11 +82,18 @@ for CFile in ${CFileList}; do
cp -f ${OMCEtcDir}/default/${CFile} ${OMCEtcDir}
fi
done
if [ ! -e "${RedisConfDir}/redis.conf" ]; then
cp ${RedisConfDir}/default/redis.conf ${RedisConfDir};
else
sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/redis.conf
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
LINE="masterauth helloearth"
FILE="${RedisConfDir}/adb.conf"
if ! grep -qxF "$LINE" "$FILE"; then
# 如果不存在，将其添加到文件末尾
echo "$LINE" >> "$FILE"
fi
if [ ! -e "${FERootDir}/config.js" ]; then cp ${FERootDir}/default/config.js ${FERootDir}; fi
for LogoFile in ${LogoFileList}; do
if [ ! -e "${OMCStaticDir}/logo/${LogoFile}" ]; then