From 090fb246420191c36506ec6e6f811ae637efa401 Mon Sep 17 00:00:00 2001
From: Tetardtek <kvnn64@gmail.com>
Date: Wed, 18 Mar 2026 22:15:01 +0100
Subject: [PATCH] =?UTF-8?q?fix(scripts):=20d=C3=A9personnaliser=20les=203?=
 =?UTF-8?q?=20scripts=20SUPERVISOR=20=E2=80=94=20VPS=5FWATCH=5FROOT=20+=20?=
 =?UTF-8?q?VPS=5FSERVICE=5FUSER?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- brain-watch-vps.sh : WATCH_ROOT hardcodé → ${VPS_WATCH_ROOT:-$HOME/brain-watch}
  + message d'erreur git clone lit BRAIN_GIT_URL depuis MYSECRETS
- install-brain-watch.sh : VPS_WATCH_ROOT + GITEA_BRAIN_URL → MYSECRETS/env
  + validation explicite si BRAIN_GIT_URL absent
- install-brain-bot.sh : WATCH_ROOT + User=tetardtek → VPS_WATCH_ROOT + VPS_SERVICE_USER
  + fallback whoami pour le service systemd

Aucun path ou URL owner hardcodé — tout passe par env ou MYSECRETS.
---
 scripts/brain-watch-vps.sh     | 6 ++++--
 scripts/install-brain-bot.sh   | 4 ++--
 scripts/install-brain-watch.sh | 9 +++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/scripts/brain-watch-vps.sh b/scripts/brain-watch-vps.sh
index 24a597f..3527b0f 100755
--- a/scripts/brain-watch-vps.sh
+++ b/scripts/brain-watch-vps.sh
@@ -13,7 +13,8 @@
 
 set -euo pipefail
 
-WATCH_ROOT="/home/tetardtek/brain-watch"
+# Configurable — override via env ou MYSECRETS (VPS_WATCH_ROOT=...)
+WATCH_ROOT="${VPS_WATCH_ROOT:-$HOME/brain-watch}"
 BRAIN_INDEX="$WATCH_ROOT/brain/BRAIN-INDEX.md"
 NOTIFY="$WATCH_ROOT/brain-notify.sh"
 BRAIN_ROOT="$WATCH_ROOT"  # pour brain-notify.sh — lit MYSECRETS ici
@@ -23,7 +24,8 @@ LOG_PREFIX="[brain-watch-vps]"
 export BRAIN_ROOT
 
 if [[ ! -d "$WATCH_ROOT/brain" ]]; then
-  echo "$LOG_PREFIX ERREUR : brain non cloné. Lancer : git clone git@git.tetardtek.com:Tetardtek/brain.git $WATCH_ROOT/brain" >&2
+  BRAIN_GIT_URL="${BRAIN_GIT_URL:-$(grep '^BRAIN_GIT_URL=' "$WATCH_ROOT/MYSECRETS" 2>/dev/null | cut -d= -f2-)}"
+  echo "$LOG_PREFIX ERREUR : brain non cloné. Lancer : git clone $BRAIN_GIT_URL $WATCH_ROOT/brain" >&2
   exit 1
 fi
 
diff --git a/scripts/install-brain-bot.sh b/scripts/install-brain-bot.sh
index 3252d02..70a6545 100755
--- a/scripts/install-brain-bot.sh
+++ b/scripts/install-brain-bot.sh
@@ -25,7 +25,7 @@ set -euo pipefail
 # Configuration — à adapter si besoin
 # ---------------------------------------------------------------------------
 
-WATCH_ROOT="/home/tetardtek/brain-watch"
+WATCH_ROOT="${VPS_WATCH_ROOT:-$HOME/brain-watch}"
 MYSECRETS="$WATCH_ROOT/MYSECRETS"
 BOT_PORT=5001
 BOT_SCRIPT="$WATCH_ROOT/brain-bot.py"
@@ -94,7 +94,7 @@ After=network.target
 
 [Service]
 Type=simple
-User=tetardtek
+User=${VPS_SERVICE_USER:-$(whoami)}
 WorkingDirectory=${WATCH_ROOT}
 Environment=BRAIN_WATCH_ROOT=${WATCH_ROOT}
 Environment=BRAIN_BOT_PORT=${BOT_PORT}
diff --git a/scripts/install-brain-watch.sh b/scripts/install-brain-watch.sh
index 45459ee..b085b10 100755
--- a/scripts/install-brain-watch.sh
+++ b/scripts/install-brain-watch.sh
@@ -13,8 +13,13 @@ TARGET="${1:-both}"
 BRAIN_ROOT="${BRAIN_ROOT:-$HOME/Dev/Brain}"
 VPS_USER="root"
 VPS_IP=$(grep '^VPS_IP=' "$BRAIN_ROOT/MYSECRETS" | cut -d= -f2-)
-VPS_WATCH_ROOT="/home/tetardtek/brain-watch"
-GITEA_BRAIN_URL="git@git.tetardtek.com:Tetardtek/brain.git"
+# Configurable — lues depuis MYSECRETS si non définies en env
+VPS_WATCH_ROOT="${VPS_WATCH_ROOT:-$(grep '^VPS_WATCH_ROOT=' "$BRAIN_ROOT/MYSECRETS" 2>/dev/null | cut -d= -f2- || echo "/home/$VPS_USER/brain-watch")}"
+GITEA_BRAIN_URL="${BRAIN_GIT_URL:-$(grep '^BRAIN_GIT_URL=' "$BRAIN_ROOT/MYSECRETS" 2>/dev/null | cut -d= -f2-)}"
+if [[ -z "$GITEA_BRAIN_URL" ]]; then
+  echo "❌ BRAIN_GIT_URL manquant — ajouter dans MYSECRETS : BRAIN_GIT_URL=git@<host>:<user>/brain.git"
+  exit 1
+fi
 
 install_local() {
   echo "=== Installation SUPERVISOR local (systemd user) ==="