Disable adding syncprov module to database while there exists replicating config.

qianwch · qianwch · commit 865f034df0f2 · 2021-07-08T10:08:41.000+08:00
diff --git a/image/service/slapd/startup.sh b/image/service/slapd/startup.sh
@@ -456,7 +456,8 @@ EOF
     function disableReplication() {
       sed -i "s|{{ LDAP_BACKEND }}|${LDAP_BACKEND}|g" ${CONTAINER_SERVICE_DIR}/slapd/assets/config/replication/replication-disable.ldif
       ldapmodify -c -Y EXTERNAL -Q -H ldapi:/// -f ${CONTAINER_SERVICE_DIR}/slapd/assets/config/replication/replication-disable.ldif 2>&1 | log-helper debug || true
-      [[ -f "$WAS_STARTED_WITH_REPLICATION" ]] && rm -f "$WAS_STARTED_WITH_REPLICATION"
+      [[ -f "$WAS_STARTED_WITH_REPLICATION" ]] && rm -f "$WAS_STARTED_WITH_REPLICATION" && \
+        sed -i '/^# Add syncprov/,/^$/d' ${CONTAINER_SERVICE_DIR}/slapd/assets/config/replication/replication-enable.ldif
     }
 
     if [ "${LDAP_REPLICATION,,}" == "true" ]; then

Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,8 @@ EOF`
`456`	`456`	`function disableReplication() {`
`457`	`457`	`sed -i "s\|{{ LDAP_BACKEND }}\|${LDAP_BACKEND}\|g" ${CONTAINER_SERVICE_DIR}/slapd/assets/config/replication/replication-disable.ldif`
`458`	`458`	`ldapmodify -c -Y EXTERNAL -Q -H ldapi:/// -f ${CONTAINER_SERVICE_DIR}/slapd/assets/config/replication/replication-disable.ldif 2>&1 \| log-helper debug \|\| true`
`459`		`- [[ -f "$WAS_STARTED_WITH_REPLICATION" ]] && rm -f "$WAS_STARTED_WITH_REPLICATION"`
	`459`	`+ [[ -f "$WAS_STARTED_WITH_REPLICATION" ]] && rm -f "$WAS_STARTED_WITH_REPLICATION" && \`
	`460`	`+ sed -i '/^# Add syncprov/,/^$/d' ${CONTAINER_SERVICE_DIR}/slapd/assets/config/replication/replication-enable.ldif`
`460`	`461`	`}`
`461`	`462`
`462`	`463`	`if [ "${LDAP_REPLICATION,,}" == "true" ]; then`