Adopt live production state as git baseline

2026-07-28 00:34:35 -05:00 · 2026-07-07 07:55:47 -05:00
commit 588cfe3f10
85 changed files with 30896 additions and 0 deletions
@@ -0,0 +1,122 @@
+#!/bin/bash
+# JARVIS Auto-Deploy Runner — processes GitHub webhook queue every minute.
+# Validates PHP syntax before deploying; auto-reverts on bad code.
+# Restarts OLS after JARVIS deploys to pick up PHP changes.
+
+QUEUE=/tmp/jarvis-deploy-queue.txt
+LOG=/home/jarvis.orbishosting.com/logs/deploy.log
+PHP=/usr/bin/php8.3
+
+TS() { date '+%Y-%m-%d %H:%M:%S'; }
+log() { echo "[$(TS)] $1" >> "$LOG"; }
+
+[ ! -f "$QUEUE" ] && exit 0
+[ ! -s "$QUEUE" ] && exit 0
+
+# Atomically take ownership of the queue via rename — prevents TOCTOU loss of
+# entries written between a cat and truncate
+PROCESSING="${QUEUE}.processing"
+mv "$QUEUE" "$PROCESSING" 2>/dev/null || exit 0
+SNAPSHOT=$(cat "$PROCESSING")
+rm -f "$PROCESSING"
+
+while IFS= read -r path; do
+    [ -z "$path" ] && continue
+    [ ! -d "$path/.git" ] && log "SKIP $path — not a git repo" && continue
+
+    log "Deploying $path"
+    cd "$path" || continue
+
+    BEFORE=$(git rev-parse HEAD 2>/dev/null)
+    git fetch origin main >> "$LOG" 2>&1
+    REMOTE=$(git rev-parse origin/main 2>/dev/null)
+
+    if [ "$BEFORE" = "$REMOTE" ]; then
+        log "Already up to date: $path"
+        continue
+    fi
+
+    git pull origin main >> "$LOG" 2>&1
+    AFTER=$(git rev-parse HEAD 2>/dev/null)
+    CHANGED=$(git diff --name-only "$BEFORE" "$AFTER" 2>/dev/null)
+
+    # PHP syntax validation — check every changed .php file
+    SYNTAX_OK=true
+    BAD_FILE=""
+    while IFS= read -r f; do
+        [[ "$f" != *.php ]] && continue
+        [ ! -f "$f" ] && continue
+        if ! $PHP -l "$f" > /dev/null 2>&1; then
+            SYNTAX_OK=false
+            BAD_FILE="$f"
+            break
+        fi
+    done <<< "$CHANGED"
+
+    if [ "$SYNTAX_OK" = false ]; then
+        log "SYNTAX ERROR in $BAD_FILE — reverting locally and pushing revert to GitHub"
+        git reset --hard "$BEFORE" >> "$LOG" 2>&1
+        # Push the revert so GitHub matches the live server — prevents infinite re-deploy loop
+        git push --force origin HEAD:main >> "$LOG" 2>&1
+        PUSH_EXIT=$?
+        if [ $PUSH_EXIT -ne 0 ]; then
+            log "WARNING: Force-push of revert failed (exit $PUSH_EXIT) — bad commit still on GitHub"
+        fi
+        # Insert alert into JARVIS DB
+        BAD_ESCAPED=$(printf '%s' "$BAD_FILE" | sed "s/'/\\\\\\'/g")
+        mysql -u jarvis_user -pJ4rv1s_Pr0t0c0l_2026! jarvis_db -se \
+            "INSERT INTO alerts (alert_type,title,message,severity)
+             VALUES ('deploy_fail','Deploy reverted: syntax error',
+             'PHP syntax error in $BAD_ESCAPED. Commit $AFTER was reverted and force-pushed to GitHub.','critical');" 2>/dev/null
+        log "Reverted. Bad commit: $AFTER"
+        continue
+    fi
+
+    log "Deploy OK ($BEFORE -> $AFTER): $path"
+    log "Changed: $(echo "$CHANGED" | tr '\n' ' ')"
+
+    # Restart OLS after any JARVIS deploy to pick up PHP changes
+    if [[ "$path" == *"jarvis"* ]]; then
+        systemctl reload lsws 2>/dev/null || systemctl restart lsws 2>/dev/null
+        log "OLS reloaded for JARVIS deploy"
+
+        # Patch live config.php with correct Ollama host/model and Groq search model
+        CONFIG="$path/api/config.php"
+        if [ -f "$CONFIG" ]; then
+            sed -i "s|http://10\.48\.200\.95:11434|http://10.48.200.210:11434|g" "$CONFIG"
+            sed -i "s|'llama3\.2:1b'|'llama3.1:8b'|g" "$CONFIG"
+            sed -i "s|\"llama3\.2:1b\"|\"llama3.1:8b\"|g" "$CONFIG"
+            sed -i "s|'llama3\.1:70b'|'llama3.1:8b'|g" "$CONFIG"
+            sed -i "s|\"llama3\.1:70b\"|\"llama3.1:8b\"|g" "$CONFIG"
+            sed -i "s|'groq/compound-mini'|'compound-beta-mini'|g;s|\"groq/compound-mini\"|\"compound-beta-mini\"|g" "$CONFIG"
+            log "Patched config.php: Ollama IP→.210, model→llama3.1:8b, Groq search→compound-beta-mini"
+        fi
+
+        # Self-install the deploy script on every run
+        cp "$path/deploy/jarvis-deploy.sh" /usr/local/bin/jarvis-deploy.sh 2>/dev/null && chmod +x /usr/local/bin/jarvis-deploy.sh
+
+        # Sync reactor.py + service file to runtime location if they changed
+        if echo "$CHANGED" | grep -q 'deploy/reactor.py\|deploy/jarvis-arc.service\|deploy/requirements.txt'; then
+            mkdir -p /opt/jarvis-arc /home/jarvis.orbishosting.com/logs
+            cp "$path/deploy/reactor.py" /opt/jarvis-arc/reactor.py
+            cp "$path/deploy/requirements.txt" /opt/jarvis-arc/requirements.txt 2>/dev/null
+            # Bootstrap venv if it doesn't exist
+            if [ ! -f /opt/jarvis-arc/venv/bin/activate ]; then
+                log "Arc Reactor venv missing — creating and installing packages"
+                python3 -m venv /opt/jarvis-arc/venv
+                /opt/jarvis-arc/venv/bin/pip install -q -r /opt/jarvis-arc/requirements.txt
+                log "Arc Reactor venv ready"
+            fi
+            if echo "$CHANGED" | grep -q 'deploy/jarvis-arc.service'; then
+                cp "$path/deploy/jarvis-arc.service" /etc/systemd/system/jarvis-arc.service
+                systemctl daemon-reload
+                systemctl enable jarvis-arc
+                log "Arc Reactor service file installed and enabled"
+            fi
+            systemctl restart jarvis-arc 2>/dev/null || \
+                bash -c "pkill -f reactor.py 2>/dev/null; sleep 1; cd /opt/jarvis-arc && source venv/bin/activate && nohup python3 reactor.py >> /home/jarvis.orbishosting.com/logs/arc_reactor.log 2>&1 &"
+            log "Arc Reactor updated and restarted"
+        fi
+    fi
+
+done <<< "$SNAPSHOT"