From 5114fcfdb089a909c8bf6670306caa1aa618e320 Mon Sep 17 00:00:00 2001
From: ilyastar9999 <ilya.starchak@yandex.com>
Date: Tue, 2 Dec 2025 18:33:05 +0300
Subject: [PATCH] Update setup.sh

---
 setuper/setup.sh | 45 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/setuper/setup.sh b/setuper/setup.sh
index 88b8c7f..e0a705d 100644
--- a/setuper/setup.sh
+++ b/setuper/setup.sh
@@ -62,20 +62,31 @@ setup_packmate() {
         cd "$packmate_dir"
     fi
     mkdir -p pcaps rsa_keys Packmate_stuff
+    # Read config from parent .env
+    BOARD_URL=$(grep '^BOARD_URL=' "$ENV_FILE" | cut -d'=' -f2- | tr -d '"' | xargs)
+    PACKMATE_LOCAL_IP=$(grep '^PACKMATE_LOCAL_IP=' "$ENV_FILE" | cut -d'=' -f2- | tr -d '"' | xargs)
+    NET_INTERFACE=$(grep '^NET_INTERFACE=' "$ENV_FILE" | cut -d'=' -f2- | tr -d '"' | xargs)
+    # Defaults if not set
+    if [ -z "$PACKMATE_LOCAL_IP" ]; then
+        PACKMATE_LOCAL_IP="10.60.1.2"
+    fi
+    if [ -z "$NET_INTERFACE" ]; then
+        NET_INTERFACE="eth0"
+    fi
     # .env and config generation (minimal)
-    cat > .env <<'ENVEOF'
+    cat > .env <<ENVEOF
 BUILD_TAG=latest
 PACKMATE_DB_PASSWORD=K604YnL3G1hp2RDkCZNjGpxbyNpNHTRb
-NET_INTERFACE=eth0
-PACKMATE_LOCAL_IP=10.60.0.1
+NET_INTERFACE=$NET_INTERFACE
+PACKMATE_LOCAL_IP=$PACKMATE_LOCAL_IP
 WEB_LOGIN=admin
 WEB_PASSWORD=admin123
 POSTGRES_USER=packmate
 POSTGRES_PASSWORD=K604YnL3G1hp2RDkCZNjGpxbyNpNHTRb
 POSTGRES_DB=packmate
 DB_PASSWORD=K604YnL3G1hp2RDkCZNjGpxbyNpNHTRb
-INTERFACE=eth0
-LOCAL_IP=10.60.0.1
+INTERFACE=$NET_INTERFACE
+LOCAL_IP=$PACKMATE_LOCAL_IP
 MODE=LIVE
 OLD_STREAMS_CLEANUP_ENABLED=true
 OLD_STREAMS_CLEANUP_INTERVAL=5
@@ -142,17 +153,22 @@ setup_farm() {
         git clone https://github.com/ilyastar9999/moded_distructive_farm.git "$farm_dir"
         cd "$farm_dir"
     fi
-    cat > .env <<'ENVEOF'
+    # Read config from parent .env
+    BOARD_URL=$(grep '^BOARD_URL=' "$ENV_FILE" | cut -d'=' -f2- | tr -d '"' | xargs)
+    TEAM_TOKEN=$(grep '^TEAM_TOKEN=' "$ENV_FILE" | cut -d'=' -f2- | tr -d '"' | xargs)
+    NUM_TEAMS=$(grep '^NUM_TEAMS=' "$ENV_FILE" | cut -d'=' -f2- | tr -d '"' | xargs)
+    IP_TEAM_BASE=$(grep '^IP_TEAM_BASE=' "$ENV_FILE" | cut -d'=' -f2- | tr -d '"' | xargs)
+    cat > .env <<ENVEOF
 DB_PORT=5432
 DB_HOST=postgres
 DB_USER=farm
 DB_PASS=farmpassword123
 DB_NAME=farm
-BOARD_URL=http://10.60.0.1
-TEAM_TOKEN=your-team-token
+BOARD_URL=$BOARD_URL
+TEAM_TOKEN=$TEAM_TOKEN
 WEB_PASSWORD=farmadmin
-NUM_TEAMS=10
-IP_TEAM_BASE=10.60.
+NUM_TEAMS=$NUM_TEAMS
+IP_TEAM_BASE=$IP_TEAM_BASE
 API_TOKEN=farm-api-token-123
 POSTGRES_USER=farm
 POSTGRES_PASSWORD=farmpassword123
@@ -204,9 +220,12 @@ setup_firegex() {
         git clone https://github.com/Pwnzer0tt1/firegex.git "$firegex_dir"
         cd "$firegex_dir"
     fi
-    cat > .env <<'ENVEOF'
-TEAM_TOKEN=your-team-token
-SCOREBOARD_URL=http://10.60.0.1
+    # Read config from parent .env
+    BOARD_URL=$(grep '^BOARD_URL=' "$ENV_FILE" | cut -d'=' -f2- | tr -d '"' | xargs)
+    TEAM_TOKEN=$(grep '^TEAM_TOKEN=' "$ENV_FILE" | cut -d'=' -f2- | tr -d '"' | xargs)
+    cat > .env <<ENVEOF
+TEAM_TOKEN=$TEAM_TOKEN
+SCOREBOARD_URL=$BOARD_URL
 FIREGEX_PORT=5000
 ENVEOF
     if [ ! -f "docker-compose.yml" ]; then