diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 0000000..7709596 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,3 @@ +#!/bin/bash +# Wallarm Node Manager — wrapper +/usr/bin/env python3 /opt/fw/app/main.py "$@" diff --git a/python/deploy.py b/python/deploy.py index b5a7997..bcee49c 100644 --- a/python/deploy.py +++ b/python/deploy.py @@ -6,8 +6,9 @@ from pathlib import Path VERSION = "1.0.0" BASE = "/opt/fw" -STATE = f"{BASE}/state.json" -CONF = f"{BASE}/fw.conf" +APP = f"{BASE}/app" +STATE = f"{APP}/state.json" +CONF = f"{APP}/fw.conf" AIO_URL = "https://storage.googleapis.com/meganode_storage/6.12/wallarm-6.12.5.x86_64-glibc.sh" AIO_PATH = f"{BASE}/wallarm-aio.sh" DEPLOY_TO = "/opt/wallarm" diff --git a/setup.sh b/setup.sh index c4d1571..a982e9f 100644 --- a/setup.sh +++ b/setup.sh @@ -11,6 +11,7 @@ set -euo pipefail BOLD='\033[1m'; GREEN='\033[0;32m'; YELLOW='\033[1;33m'; RED='\033[0;31m'; NC='\033[0m' REPO="https://git.sechpoint.app/customer-engineering/wallarm/raw/branch/main/python" WALLARM_DIR="/opt/fw" +APP_DIR="${WALLARM_DIR}/app" echo -e "${BOLD}Wallarm Bootstrap${NC}" @@ -56,15 +57,17 @@ fi echo -e "${GREEN}Python: $($PYTHON_BIN --version)${NC}" -# ── Download deploy.py ──────────────────────────────────────────────── -mkdir -p "$WALLARM_DIR" +# ── Download deploy.py + wrapper ───────────────────────────────────── +mkdir -p "$APP_DIR" if command -v curl >/dev/null 2>&1; then - curl -fsSL "${REPO}/deploy.py" -o "${WALLARM_DIR}/deploy.py" + curl -fsSL "${REPO}/deploy.py" -o "${APP_DIR}/main.py" + curl -fsSL "https://git.sechpoint.app/customer-engineering/wallarm/raw/branch/main/deploy.sh" -o "${WALLARM_DIR}/deploy.sh" else - wget -q "${REPO}/deploy.py" -O "${WALLARM_DIR}/deploy.py" + wget -q "${REPO}/deploy.py" -O "${APP_DIR}/main.py" + wget -q "https://git.sechpoint.app/customer-engineering/wallarm/raw/branch/main/deploy.sh" -O "${WALLARM_DIR}/deploy.sh" fi -chmod +x "${WALLARM_DIR}/deploy.py" +chmod +x "${APP_DIR}/main.py" "${WALLARM_DIR}/deploy.sh" echo echo -e "${GREEN}${BOLD}Ready!${NC}" -echo -e " ${GREEN}sudo ${PYTHON_BIN} /opt/fw/deploy.py${NC}" +echo -e " ${GREEN}sudo /opt/fw/deploy.sh${NC}"