fix: adb conf issue

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    

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

@@ -2084,3 +2084,4 @@ replica-weighting-factor 2
 
 # set slave of UDM primary redis
 slaveof 172.16.5.140 6379
+masterauth helloearth

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

@@ -2087,3 +2087,4 @@ replica-weighting-factor 2
 
 # set slave of UDM primary redis
 slaveof 172.16.5.140 6379
+masterauth helloearth

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    

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    
+if [ ! -e "${RedisConfDir}/adb.conf" ]; then    
-    cp ${RedisConfDir}/default/redis.conf ${RedisConfDir}; 
+    cp ${RedisConfDir}/default/adb.conf ${RedisConfDir}; 
-else
-    sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/redis.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
+    
 if [ ! -e "${FERootDir}/config.js" ]; then    cp ${FERootDir}/default/config.js ${FERootDir}; fi    
 for LogoFile in ${LogoFileList}; do
     if [ ! -e "${OMCStaticDir}/logo/${LogoFile}" ]; then