"Improve archive mode verification and use postgres user for pgBackRest"

Author: whispin

scripts/backup-functions.sh

@@ -337,7 +337,14 @@ configure_pgbackrest_stanza() {
     # Verify that archive_mode is enabled
     log "INFO" "Verifying PostgreSQL archive mode configuration..."
     local archive_mode_check
-    archive_mode_check=$(PGPASSWORD="$POSTGRES_PASSWORD" psql -h 127.0.0.1 -U "$pg_user" -d "$pg_database" -t -c "SHOW archive_mode;" 2>/dev/null | tr -d ' ')
+    
+    # Try connecting as postgres user via socket first (most reliable)
+    archive_mode_check=$(su-exec postgres psql -d "$pg_database" -t -c "SHOW archive_mode;" 2>/dev/null | tr -d ' ')
+    
+    # If that fails, try with the configured user
+    if [ -z "$archive_mode_check" ] || [ "$archive_mode_check" = "" ]; then
+        archive_mode_check=$(PGPASSWORD="$POSTGRES_PASSWORD" psql -h 127.0.0.1 -U "$pg_user" -d "$pg_database" -t -c "SHOW archive_mode;" 2>/dev/null | tr -d ' ')
+    fi
 
     if [ "$archive_mode_check" != "on" ]; then
         log "ERROR" "Archive mode is not enabled (current: $archive_mode_check). This is required for pgBackRest."
@@ -354,7 +361,7 @@ configure_pgbackrest_stanza() {
 pg1-path=${pgdata}
 pg1-socket-path=${socket_dir}
 pg1-port=${pg_port}
-pg1-user=${pg_user}
+pg1-user=postgres
 pg1-database=${pg_database}
 EOF
 

scripts/docker-entrypoint.sh

@@ -142,28 +142,51 @@ EOSQL
         return 1
     fi
 
-    # If this is a fresh initialization, restart PostgreSQL to apply archive settings
-    if [ ! -f "$PGDATA/.archive_configured" ]; then
-        log "INFO" "Restarting PostgreSQL to apply archive configuration..."
-
+    # Verify archive_mode is properly configured
+    log "INFO" "Verifying archive_mode configuration..."
+    
+    # Check if archive_mode is enabled
+    archive_mode_status=$(su-exec postgres psql -d postgres -t -c "SHOW archive_mode;" 2>/dev/null | tr -d '[:space:]' || echo "")
+    
+    if [ "$archive_mode_status" != "on" ]; then
+        log "WARN" "Archive mode is not enabled (current: $archive_mode_status), restarting PostgreSQL..."
+        
         # Stop current PostgreSQL instance
         kill $POSTGRES_PID 2>/dev/null || true
         wait $POSTGRES_PID 2>/dev/null || true
-
+        
+        # Ensure archive settings are in postgresql.conf
+        if ! grep -q "archive_mode = on" "$PGDATA/postgresql.conf"; then
+            echo "archive_mode = on" >> "$PGDATA/postgresql.conf"
+        fi
+        if ! grep -q "wal_level = replica" "$PGDATA/postgresql.conf"; then
+            echo "wal_level = replica" >> "$PGDATA/postgresql.conf"
+        fi
+        if ! grep -q "archive_command" "$PGDATA/postgresql.conf"; then
+            echo "archive_command = 'pgbackrest --stanza=${PGBACKREST_STANZA:-main} archive-push %p'" >> "$PGDATA/postgresql.conf"
+        fi
+        
         # Start PostgreSQL again
         su-exec postgres postgres &
         POSTGRES_PID=$!
-
+        
         # Wait for PostgreSQL to be ready again
         if ! wait_for_postgres 120; then
             log "ERROR" "PostgreSQL failed to restart with archive configuration"
             kill $POSTGRES_PID 2>/dev/null || true
             return 1
         fi
-
-        # Mark archive as configured
-        touch "$PGDATA/.archive_configured"
-        log "INFO" "PostgreSQL restarted successfully with archive configuration"
+        
+        # Verify archive_mode is now enabled
+        archive_mode_status=$(su-exec postgres psql -d postgres -t -c "SHOW archive_mode;" 2>/dev/null | tr -d '[:space:]' || echo "")
+        if [ "$archive_mode_status" = "on" ]; then
+            log "INFO" "Archive mode successfully enabled"
+        else
+            log "ERROR" "Failed to enable archive mode (current: $archive_mode_status)"
+            return 1
+        fi
+    else
+        log "INFO" "Archive mode is already enabled"
     fi
 
     log "INFO" "PostgreSQL is ready"