.gitea/workflows/build.yaml

@@ -273,36 +273,23 @@ jobs:
         if: always()
         run: docker logout ${{ env.REGISTRY }} || true
 
-  # Stage 7: Trigger CD pipeline for terraform-docker-openldap
+  # Stage 7: Update CD pipeline (trigger deployment)
   update-cd:
     runs-on: ubuntu-latest
     needs: push
     if: needs.push.result == 'success'
     steps:
-      - name: Trigger terraform-docker-openldap pipeline
+      - name: Trigger CD pipeline
         run: |
           echo "=============================================="
-          echo "  Triggering CD pipeline"
+          echo "  Ready to update CD pipeline"
           echo "=============================================="
           echo "New version: ${{ needs.push.outputs.version }}"
           echo "Full image:  ${{ needs.push.outputs.full_image }}"
           echo ""
-
+          echo "TODO: Add step to update version in CD repository"
-          # Trigger the Gitea Actions workflow via repository dispatch
+          echo "This could be:"
-          curl -X POST \
+          echo "  - Update docker-compose.yml in infra repo"
-            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+          echo "  - Update Helm values"
-            -H "Content-Type: application/json" \
+          echo "  - Trigger ArgoCD sync"
-            "${{ vars.GITEA_URL }}/api/v1/repos/wbyc/terraform-docker-openldap/actions/workflows/pipeline.yaml/dispatches" \
-            -d '{
-              "ref": "main",
-              "inputs": {
-                "image_tag": "${{ needs.push.outputs.version }}"
-              }
-            }' || {
-              echo "::warning::Failed to trigger CD pipeline"
-              exit 1
-            }
-
-          echo "=============================================="
-          echo "  CD pipeline triggered successfully"
           echo "=============================================="

scripts/init-config.sh

@@ -13,20 +13,6 @@ export LDAP_ADMIN_PASSWORD_HASH LDAP_CONFIG_PASSWORD_HASH
 # Create initial slapd.d configuration
 rm -rf /etc/openldap/slapd.d/*
 
-# Build TLS attributes if enabled
-TLS_CONFIG=""
-if [ "$LDAP_TLS_ENABLED" = "true" ] && [ -f "$LDAP_TLS_CERT_FILE" ] && [ -f "$LDAP_TLS_KEY_FILE" ]; then
-    log_info "Adding TLS configuration..."
-    TLS_CONFIG="olcTLSCertificateFile: ${LDAP_TLS_CERT_FILE}
-olcTLSCertificateKeyFile: ${LDAP_TLS_KEY_FILE}"
-    if [ -f "$LDAP_TLS_CA_FILE" ]; then
-        TLS_CONFIG="${TLS_CONFIG}
-olcTLSCACertificateFile: ${LDAP_TLS_CA_FILE}"
-    fi
-    TLS_CONFIG="${TLS_CONFIG}
-olcTLSVerifyClient: ${LDAP_TLS_VERIFY_CLIENT}"
-fi
-
 # Create base cn=config LDIF
 cat > /tmp/init-config.ldif << EOF
 dn: cn=config
@@ -35,7 +21,6 @@ cn: config
 olcArgsFile: /run/openldap/slapd.args
 olcPidFile: /run/openldap/slapd.pid
 olcLogLevel: ${LDAP_LOG_LEVEL}
-${TLS_CONFIG}
 
 dn: cn=module{0},cn=config
 objectClass: olcModuleList
@@ -83,6 +68,35 @@ olcDbIndex: entryUUID eq
 olcDbMaxSize: 1073741824
 EOF
 
+# Add TLS configuration if enabled and certs exist
+if [ "$LDAP_TLS_ENABLED" = "true" ] && [ -f "$LDAP_TLS_CERT_FILE" ] && [ -f "$LDAP_TLS_KEY_FILE" ]; then
+    log_info "Adding TLS configuration..."
+    cat >> /tmp/init-config.ldif << EOF
+
+dn: cn=config
+changetype: modify
+add: olcTLSCertificateFile
+olcTLSCertificateFile: ${LDAP_TLS_CERT_FILE}
+-
+add: olcTLSCertificateKeyFile
+olcTLSCertificateKeyFile: ${LDAP_TLS_KEY_FILE}
+EOF
+
+    if [ -f "$LDAP_TLS_CA_FILE" ]; then
+        cat >> /tmp/init-config.ldif << EOF
+-
+add: olcTLSCACertificateFile
+olcTLSCACertificateFile: ${LDAP_TLS_CA_FILE}
+EOF
+    fi
+
+    cat >> /tmp/init-config.ldif << EOF
+-
+add: olcTLSVerifyClient
+olcTLSVerifyClient: ${LDAP_TLS_VERIFY_CLIENT}
+EOF
+fi
+
 # Import the configuration
 log_info "Importing cn=config with slapadd..."
 /usr/sbin/slapadd -n 0 -F /etc/openldap/slapd.d -l /tmp/init-config.ldif

scripts/init-replication.sh

@@ -91,30 +91,13 @@ IFS="$OLD_IFS"
 
 # Configure syncrepl and mirrormode on the database
 log_info "Configuring syncrepl and mirrormode..."
-
-# Check if olcSyncRepl attribute already exists
-if ldapsearch -Y EXTERNAL -H "$LDAPI_SOCKET" -b "olcDatabase={1}mdb,cn=config" -s base "(olcSyncRepl=*)" olcSyncRepl 2>/dev/null | grep -q "olcSyncRepl:"; then
-    SYNCREPL_OP="replace"
-    log_info "Updating existing syncrepl configuration..."
-else
-    SYNCREPL_OP="add"
-    log_info "Adding new syncrepl configuration..."
-fi
-
-# Check if olcMirrorMode attribute already exists
-if ldapsearch -Y EXTERNAL -H "$LDAPI_SOCKET" -b "olcDatabase={1}mdb,cn=config" -s base "(olcMirrorMode=*)" olcMirrorMode 2>/dev/null | grep -q "olcMirrorMode:"; then
-    MIRRORMODE_OP="replace"
-else
-    MIRRORMODE_OP="add"
-fi
-
 cat > /tmp/repl-syncrepl.ldif << EOF
 dn: olcDatabase={1}mdb,cn=config
 changetype: modify
-${SYNCREPL_OP}: olcSyncRepl
+replace: olcSyncRepl
 ${SYNCREPL_CONFIG}
 -
-${MIRRORMODE_OP}: olcMirrorMode
+replace: olcMirrorMode
 olcMirrorMode: TRUE
 EOF