diff --git a/debbuild/22.04/DEBIAN/postinst b/debbuild/22.04/DEBIAN/postinst index 5772307..f99e54d 100644 --- a/debbuild/22.04/DEBIAN/postinst +++ b/debbuild/22.04/DEBIAN/postinst @@ -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 diff --git a/debbuild/22.04/usr/local/omc/depends/adb/usr/local/etc/adb/default/adb.conf b/debbuild/22.04/usr/local/omc/depends/adb/usr/local/etc/adb/default/adb.conf index 091eb1f..7e6a35f 100644 --- a/debbuild/22.04/usr/local/omc/depends/adb/usr/local/etc/adb/default/adb.conf +++ b/debbuild/22.04/usr/local/omc/depends/adb/usr/local/etc/adb/default/adb.conf @@ -2083,4 +2083,5 @@ replica-weighting-factor 2 # blob-support false # set slave of UDM primary redis -slaveof 172.16.5.140 6379 \ No newline at end of file +slaveof 172.16.5.140 6379 +masterauth helloearth \ No newline at end of file diff --git a/debbuild/22.04/usr/local/omc/depends/adb/usr/local/etc/adb/default/adb.conf_dual b/debbuild/22.04/usr/local/omc/depends/adb/usr/local/etc/adb/default/adb.conf_dual index eb30a9f..465ac68 100644 --- a/debbuild/22.04/usr/local/omc/depends/adb/usr/local/etc/adb/default/adb.conf_dual +++ b/debbuild/22.04/usr/local/omc/depends/adb/usr/local/etc/adb/default/adb.conf_dual @@ -2086,4 +2086,5 @@ replica-weighting-factor 2 # blob-support false # set slave of UDM primary redis -slaveof 172.16.5.140 6379 \ No newline at end of file +slaveof 172.16.5.140 6379 +masterauth helloearth \ No newline at end of file diff --git a/debbuild/DEBIAN/postinst b/debbuild/DEBIAN/postinst index 030936e..85bc2be 100644 --- a/debbuild/DEBIAN/postinst +++ b/debbuild/DEBIAN/postinst @@ -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 diff --git a/rpmbuild/SPECS/omc.spec b/rpmbuild/SPECS/omc.spec index 2875911..7af59a5 100644 --- a/rpmbuild/SPECS/omc.spec +++ b/rpmbuild/SPECS/omc.spec @@ -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