Science Commit 5.

Author: mearvk

modules/black/presidential/Brarner.M.Alete/install/deploy-local.sh

@@ -53,28 +53,50 @@ elif ls "$BMA_ROOT/lib/"*.jar &>/dev/null; then
     echo "[*] JARs copied from lib/ to WEB-INF/lib/"
 fi
 
-# Ensure db.properties exists — prompt if missing
+# Ensure db.properties exists — use .nwe-credentials or prompt if interactive
 DB_PROPS="$DEPLOY_DIR/WEB-INF/db.properties"
-if [ ! -f "$DB_PROPS" ] || ! grep -q "db.password=." "$DB_PROPS" 2>/dev/null; then
-    echo ""
-    echo "[*] db.properties needs MySQL credentials for JSP pages."
-    read -rp "    MySQL user [root]: " DB_USER
-    DB_USER="${DB_USER:-root}"
-    read -rsp "    MySQL password: " DB_PASS
-    echo ""
-    read -rp "    MySQL host [localhost]: " DB_HOST
-    DB_HOST="${DB_HOST:-localhost}"
-    read -rp "    MySQL port [3306]: " DB_PORT
-    DB_PORT="${DB_PORT:-3306}"
-    cat > "$DB_PROPS" <<EOF
+if [ ! -f "$DB_PROPS" ] || ! grep -q "db.password=." "$DB_PROPS" 2>/dev/null || grep -q "CHANGE_ME" "$DB_PROPS" 2>/dev/null; then
+    # Try .nwe-credentials first (non-interactive safe)
+    NWE_ROOT="$(cd "$SCRIPT_DIR/../../../.." 2>/dev/null && pwd)"
+    if [ -f "$NWE_ROOT/.nwe-credentials" ]; then
+        source "$NWE_ROOT/.nwe-credentials"
+        mkdir -p "$DEPLOY_DIR/WEB-INF"
+        cat > "$DB_PROPS" <<EOF
+# BMA Database Configuration — auto-generated from .nwe-credentials
+db.driver=com.mysql.cj.jdbc.Driver
+db.url=jdbc:mysql://${NWE_DB_HOST:-127.0.0.1}:${NWE_DB_PORT:-3306}/BrarnerScience
+db.user=${NWE_DB_USER:-root}
+db.password=${NWE_DB_PASS}
+EOF
+        chmod 600 "$DB_PROPS"
+        echo "[*] db.properties generated from .nwe-credentials"
+    elif [ -t 0 ]; then
+        # Interactive terminal — prompt for credentials
+        echo ""
+        echo "[*] db.properties needs MySQL credentials for JSP pages."
+        read -rp "    MySQL user [root]: " DB_USER
+        DB_USER="${DB_USER:-root}"
+        read -rsp "    MySQL password: " DB_PASS
+        echo ""
+        read -rp "    MySQL host [localhost]: " DB_HOST
+        DB_HOST="${DB_HOST:-localhost}"
+        read -rp "    MySQL port [3306]: " DB_PORT
+        DB_PORT="${DB_PORT:-3306}"
+        mkdir -p "$DEPLOY_DIR/WEB-INF"
+        cat > "$DB_PROPS" <<EOF
 # BMA Database Configuration — written by deploy-local.sh
 db.driver=com.mysql.cj.jdbc.Driver
 db.url=jdbc:mysql://${DB_HOST}:${DB_PORT}/BrarnerScience
 db.user=${DB_USER}
 db.password=${DB_PASS}
 EOF
-    chmod 600 "$DB_PROPS"
-    echo "[*] db.properties written"
+        chmod 600 "$DB_PROPS"
+        echo "[*] db.properties written"
+    else
+        # Non-interactive and no credentials file — skip (don't hang)
+        echo "[!] db.properties missing and no .nwe-credentials found (non-interactive)"
+        echo "    JSP database pages will fail. Create .nwe-credentials and redeploy."
+    fi
 else
     echo "[*] db.properties present (user=$(grep '^db.user=' "$DB_PROPS" | cut -d= -f2-))"
 fi

modules/red/Futures/data/uptime.accumulator

@@ -1 +1 @@
-4695
+6495

scripts/web/deploy-all.sh

@@ -41,16 +41,21 @@ for SCRIPT in $ENABLED; do
     # Run setup-db if it exists alongside deploy script
     SETUP_DB="$(dirname "$FULL_PATH")/setup-db.sh"
     if [ -f "$SETUP_DB" ]; then
-        bash "$SETUP_DB" 2>/dev/null && echo "  [DB] $(basename "$(dirname "$SETUP_DB")") database ready" || true
+        timeout 30 bash "$SETUP_DB" 2>/dev/null && echo "  [DB] $(basename "$(dirname "$SETUP_DB")") database ready" || true
     fi
 
     if [ -f "$FULL_PATH" ]; then
         echo ""
         echo "[*] Deploying: $SCRIPT"
-        if bash "$FULL_PATH" 2>&1 | tail -3; then
+        if timeout 60 bash "$FULL_PATH" 2>&1 | tail -3; then
             PASS=$((PASS + 1))
         else
-            echo "[!] Failed: $SCRIPT"
+            EXIT_CODE=$?
+            if [ $EXIT_CODE -eq 124 ]; then
+                echo "[!] TIMEOUT (60s): $SCRIPT — skipping (may need manual deploy)"
+            else
+                echo "[!] Failed: $SCRIPT"
+            fi
             FAIL=$((FAIL + 1))
         fi
     else
@@ -59,7 +64,7 @@ for SCRIPT in $ENABLED; do
             bash "$PROJECT_ROOT/scripts/fix-missing-deploy-scripts.sh" 2>/dev/null
             if [ -f "$FULL_PATH" ]; then
                 echo "[*] Auto-created missing script, deploying: $SCRIPT"
-                bash "$FULL_PATH" 2>&1 | tail -3 && PASS=$((PASS + 1)) || FAIL=$((FAIL + 1))
+                timeout 60 bash "$FULL_PATH" 2>&1 | tail -3 && PASS=$((PASS + 1)) || FAIL=$((FAIL + 1))
             else
                 echo "[!] Script not found (nested .git repo?): $FULL_PATH"
                 FAIL=$((FAIL + 1))

scripts/web/post-clone.sh

@@ -91,13 +91,13 @@ SETUP_SCRIPTS=(
 for SETUP in "${SETUP_SCRIPTS[@]}"; do
     FULL="$PROJECT_ROOT/$SETUP"
     if [ -f "$FULL" ]; then
-        bash "$FULL" 2>/dev/null && echo "  [OK] $SETUP" || echo "  [WARN] $SETUP (MySQL may not be ready)"
+        timeout 30 bash "$FULL" 2>/dev/null && echo "  [OK] $SETUP" || echo "  [WARN] $SETUP (timeout or MySQL not ready)"
     fi
 done
 
-# 6. Deploy all web modules
+# 6. Deploy all web modules (60s timeout per module)
 echo ""
-bash "$SCRIPT_DIR/deploy-all.sh"
+timeout 600 bash "$SCRIPT_DIR/deploy-all.sh" || echo "[WARN] deploy-all.sh timed out (10 min) — some modules may need manual deploy"
 
 # 7. Start Tomcat
 systemctl start tomcat 2>/dev/null || "$TOMCAT_HOME/bin/startup.sh"