From 7810b8e5ca3663f63d7b8dba0bfb57a115e7dbfa Mon Sep 17 00:00:00 2001 From: ilyastar9999 Date: Tue, 2 Dec 2025 14:13:03 +0300 Subject: [PATCH] Update setup.sh --- setuper/setup.sh | 116 +++++++++++++++++++++++------------------------ 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/setuper/setup.sh b/setuper/setup.sh index 38137d9..db92840 100644 --- a/setuper/setup.sh +++ b/setuper/setup.sh @@ -55,41 +55,41 @@ setup_packmate() { mkdir -p pcaps rsa_keys Packmate_stuff # Create .env file - cat > .env < .env <<'ENVEOF' BUILD_TAG=latest PACKMATE_DB_PASSWORD=${PACKMATE_DB_PASSWORD:-K604YnL3G1hp2RDkCZNjGpxbyNpNHTRb} NET_INTERFACE=${NET_INTERFACE:-eth0} PACKMATE_LOCAL_IP=${PACKMATE_LOCAL_IP:-10.60.0.1} WEB_LOGIN=${WEB_LOGIN:-admin} WEB_PASSWORD=${WEB_PASSWORD:-admin123} -EOF +ENVEOF # Create PostgreSQL config - cat > Packmate_stuff/postgresql.conf < Packmate_stuff/postgresql.conf <<'PGEOF' port = 65001 max_connections = 100 shared_buffers = 128MB -EOF +PGEOF # Create update script - cat > Packmate_stuff/update_db_config.sh <<'EOF' + cat > Packmate_stuff/update_db_config.sh <<'SHEOF' #!/bin/bash cp /tmp/postgresql.conf /var/lib/postgresql/data/postgresql.conf -EOF +SHEOF chmod +x Packmate_stuff/update_db_config.sh # Create docker-compose.yml - cat > docker-compose.yml < docker-compose.yml <<'DCEOF' version: '3.8' services: packmate: environment: - DB_PASSWORD: \${PACKMATE_DB_PASSWORD:-K604YnL3G1hp2RDkCZNjGpxbyNpNHTRb} - INTERFACE: \${NET_INTERFACE:-} - LOCAL_IP: \${PACKMATE_LOCAL_IP} + DB_PASSWORD: ${PACKMATE_DB_PASSWORD:-K604YnL3G1hp2RDkCZNjGpxbyNpNHTRb} + INTERFACE: ${NET_INTERFACE:-} + LOCAL_IP: ${PACKMATE_LOCAL_IP} MODE: LIVE - WEB_LOGIN: \${WEB_LOGIN:-admin} - WEB_PASSWORD: \${WEB_PASSWORD:-admin123} + WEB_LOGIN: ${WEB_LOGIN:-admin} + WEB_PASSWORD: ${WEB_PASSWORD:-admin123} OLD_STREAMS_CLEANUP_ENABLED: true OLD_STREAMS_CLEANUP_INTERVAL: 5 OLD_STREAMS_CLEANUP_THRESHOLD: 240 @@ -97,7 +97,7 @@ services: - .env container_name: packmate-app network_mode: "host" - image: registry.gitlab.com/packmate/packmate:\${BUILD_TAG:-latest} + image: registry.gitlab.com/packmate/packmate:${BUILD_TAG:-latest} volumes: - "./pcaps/:/app/pcaps/:ro" - "./rsa_keys/:/app/rsa_keys/:ro" @@ -109,7 +109,7 @@ services: container_name: packmate-db environment: POSTGRES_USER: packmate - POSTGRES_PASSWORD: \${PACKMATE_DB_PASSWORD:-K604YnL3G1hp2RDkCZNjGpxbyNpNHTRb} + POSTGRES_PASSWORD: ${PACKMATE_DB_PASSWORD:-K604YnL3G1hp2RDkCZNjGpxbyNpNHTRb} POSTGRES_DB: packmate network_mode: "host" image: postgres:15.2 @@ -121,7 +121,7 @@ services: interval: 2s timeout: 5s retries: 15 -EOF +DCEOF echo "Packmate setup complete!" @@ -155,7 +155,7 @@ setup_farm() { fi # Create .env file - cat > .env < .env <<'ENVEOF' # Database configuration DB_PORT=5432 DB_HOST=postgres @@ -176,10 +176,10 @@ IP_TEAM_BASE=${IP_TEAM_BASE:-10.60.} # API Token API_TOKEN=${FARM_API_TOKEN:-farm-api-token-123} -EOF +ENVEOF # Create docker-compose.yml - cat > docker-compose.yml < docker-compose.yml <<'DCEOF' version: '3.8' services: farm: @@ -188,17 +188,17 @@ services: postgres: condition: service_healthy environment: - - DB_PORT=\${DB_PORT} - - DB_HOST=\${DB_HOST} - - DB_USER=\${DB_USER} - - DB_PASS=\${DB_PASS} - - DB_NAME=\${DB_NAME} - - BOARD_URL=\${BOARD_URL} - - TEAM_TOKEN=\${TEAM_TOKEN} - - WEB_PASSWORD=\${WEB_PASSWORD} - - NUM_TEAMS=\${NUM_TEAMS} - - IP_TEAM_BASE=\${IP_TEAM_BASE} - - API_TOKEN=\${API_TOKEN} + - DB_PORT=${DB_PORT} + - DB_HOST=${DB_HOST} + - DB_USER=${DB_USER} + - DB_PASS=${DB_PASS} + - DB_NAME=${DB_NAME} + - BOARD_URL=${BOARD_URL} + - TEAM_TOKEN=${TEAM_TOKEN} + - WEB_PASSWORD=${WEB_PASSWORD} + - NUM_TEAMS=${NUM_TEAMS} + - IP_TEAM_BASE=${IP_TEAM_BASE} + - API_TOKEN=${API_TOKEN} env_file: - .env container_name: farm-app @@ -209,16 +209,21 @@ services: postgres: image: postgres:18 environment: - - POSTGRES_USER=\${DB_USER} - - POSTGRES_PASSWORD=\${DB_PASS} - - POSTGRES_DB=\${DB_NAME} + - POSTGRES_USER=${DB_USER} + - POSTGRES_PASSWORD=${DB_PASS} + - POSTGRES_DB=${DB_NAME} healthcheck: - test: pg_isready -U \${DB_USER} -d \${DB_NAME} + test: pg_isready -U ${DB_USER} -d ${DB_NAME} interval: 10s timeout: 3s retries: 3 volumes: - farm-db:/var/lib/postgresql/data + +volumes: + farm-db: +DCEOF + echo "moded_distructive_farm setup complete!" # Register with controller @@ -230,11 +235,6 @@ services: echo " You can register manually later via the web dashboard" fi - cd "$SCRIPT_DIR" - # Register with controller - echo "Registering farm with controller..." - call_api "/services" "POST" "{\"name\": \"farm\", \"path\": \"$farm_dir\", \"git_url\": \"https://github.com/ilyastar9999/moded_distructive_farm.git\"}" - cd "$SCRIPT_DIR" } @@ -256,16 +256,16 @@ setup_firegex() { fi # Create .env file - cat > .env < .env <<'ENVEOF' # Firegex configuration TEAM_TOKEN=${TEAM_TOKEN:-your-team-token} SCOREBOARD_URL=${BOARD_URL:-http://10.60.0.1} FIREGEX_PORT=${FIREGEX_PORT:-5000} -EOF +ENVEOF # Create docker-compose.yml if not exists if [ ! -f "docker-compose.yml" ]; then - cat > docker-compose.yml < docker-compose.yml <<'DCEOF' version: '3.8' services: firegex: @@ -273,10 +273,15 @@ services: env_file: - .env environment: - - TEAM_TOKEN=\${TEAM_TOKEN} - - SCOREBOARD_URL=\${SCOREBOARD_URL} + - TEAM_TOKEN=${TEAM_TOKEN} + - SCOREBOARD_URL=${SCOREBOARD_URL} container_name: firegex-app restart: always + ports: + - "${FIREGEX_PORT:-5000}:5000" +DCEOF + fi + echo "Firegex setup complete!" # Register with controller @@ -288,11 +293,6 @@ services: echo " You can register manually later via the web dashboard" fi - cd "$SCRIPT_DIR" - # Register with controller - echo "Registering Firegex with controller..." - call_api "/services" "POST" "{\"name\": \"firegex\", \"path\": \"$firegex_dir\", \"git_url\": \"https://github.com/Pwnzer0tt1/firegex.git\"}" - cd "$SCRIPT_DIR" } @@ -310,6 +310,16 @@ main() { if [ "$setup_pm" = "y" ]; then setup_packmate + fi + + if [ "$setup_fm" = "y" ]; then + setup_farm + fi + + if [ "$setup_fg" = "y" ]; then + setup_firegex + fi + echo "" echo "=== Setup Complete! ===" echo "Services have been configured in: $SERVICES_DIR" @@ -319,16 +329,6 @@ main() { echo " 2. Access web dashboard: http://localhost:8000" echo " 3. Register services via the dashboard if auto-registration failed" echo "" -} fi - - if [ "$setup_fg" = "y" ]; then - setup_firegex - fi - - echo "" - echo "=== Setup Complete! ===" - echo "Services have been configured in: $SERVICES_DIR" - echo "You can manage them through the controller API or web dashboard" } # Run main if executed directly