Build [v1.9.12] (Secure Seal & LDAP Sync: Custom Caddy & Config Volume)

deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # =============================================================================
-# TFM aInventory - Bulletproof Deployment Script (v1.9.10)
+# TFM aInventory - Bulletproof Deployment Script (v1.9.12)
 # =============================================================================
 
 set -e
@@ -30,7 +30,7 @@ for arg in "$@"; do
         --help)
             echo "Usage: ./deploy.sh [options]"
             echo "Options:"
-            echo "  --reset-ssl    Clear Caddy storage and reset certificates"
+            echo "  --reset-ssl    Clear Caddy storage and reset certificates (Aggressive)"
             echo "  --reset-admin  Force reset Admin password to 'Admin123!'"
             echo "  --help         Show this help message"
             exit 0
@@ -39,19 +39,25 @@ for arg in "$@"; do
 done
 
 if [ "$RESET_SSL" = true ]; then
-    echo "🧹 Resetting SSL certificates..."
+    echo "🧹 Aggressive SSL Reset in progress..."
     docker compose down
+    # Clear internal docker volumes
     docker volume rm -f inventory_caddy_data 2>/dev/null || true
-    echo "✅ SSL data cleared."
+    docker volume rm -f inventory_caddy_config 2>/dev/null || true
+    # Clear persistent host volumes if they exist
+    rm -rf ./data/caddy_data/* 2>/dev/null || true
+    rm -rf ./data/caddy_config/* 2>/dev/null || true
+    echo "✅ SSL storage completely cleared."
 fi
 
 echo "🚀 Starting TFM aInventory Services..."
+# Use --build to ensure the custom Caddy image is built
 docker compose --env-file inventory.env up -d --build --remove-orphans
 
 if [ "$RESET_ADMIN" = true ]; then
     echo "🔐 Resetting Admin credentials..."
     # Wait for container to be ready
-    sleep 2
+    sleep 3
     docker compose exec backend python3 -m backend.scripts.reset_admin
 fi
 
@@ -60,17 +66,18 @@ echo "🔍 Verifying port mapping..."
 docker compose ps --format "table {{.Name}}\t{{.Status}}\t{{.Ports}}"
 
 echo ""
-echo "🚀 DIAGNOSTIC LOGS (Proxy SSL Handshake):"
+echo "🚀 DIAGNOSTIC LOGS (Proxy Status):"
 docker compose logs proxy --tail 20
 
 echo ""
-echo "✅ Deployment complete."
+echo "✅ Deployment complete (v1.9.12)."
 echo "   ------------------------------------------------------------"
-echo "   DEFAULT CREDENTIALS:"
+echo "   ACCESS COORDINATES:"
+echo "   1. SECURE: https://${SERVER_IP:-localhost}:${FRONTEND_SSL_PORT:-8919}"
+echo "   2. DIRECT: http://${SERVER_IP:-localhost}:${FRONTEND_PORT:-8917}"
+echo "   ------------------------------------------------------------"
+echo "   CREDENTIALS (if first run or reset):"
 echo "   User: Admin"
 echo "   Pass: Admin123!"
 echo "   ------------------------------------------------------------"
-echo "   1. SECURE ACCESS: https://${SERVER_IP:-localhost}:${FRONTEND_SSL_PORT:-8919}"
-echo "   2. DIRECT ACCESS: http://${SERVER_IP:-localhost}:${FRONTEND_PORT:-8917}"
-echo "   ------------------------------------------------------------"
 echo ""