From 78c3a790be9bfb6c36794f6e58761ef995381474 Mon Sep 17 00:00:00 2001 From: d4nn13 Date: Sun, 19 Apr 2026 19:41:44 +0200 Subject: [PATCH] auto-start services, prompt for WG + LAN nets, fix busybox httpd applet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - create-lxc.sh prompts for WIRECON_NET / PEER_IP / CLIENT_IP / LAN_CIDR (defaults 10.13.13.0/24, .1, .2, 192.168.1.0/24) and passes them through to the in-container bootstrap - install.sh generates a placeholder /etc/wireguard/wg0.conf from those env vars instead of copying the static example, and updates PEER_IP in wirecon.conf on first install - install.sh always enables + starts wg-quick, watchdog, monitor and (if WIRECON_WEB_AUTOSTART=yes, default yes) the web UI, even before keys are filled in — wg-quick will fail until then, and the web UI is the way to finish configuration - apk installs busybox-extras and wirecon-web now runs /usr/sbin/httpd (fixes "httpd: applet not found" on base busybox) - create-lxc.sh drops its own web-UI start block (install.sh owns it) Co-Authored-By: Claude Opus 4.7 --- lxc/etc/init.d/wirecon-web | 4 +- lxc/install.sh | 100 ++++++++++++++++++++++++------------- proxmox/create-lxc.sh | 65 ++++++++++++++++-------- 3 files changed, 112 insertions(+), 57 deletions(-) diff --git a/lxc/etc/init.d/wirecon-web b/lxc/etc/init.d/wirecon-web index 613f8fa..af92157 100755 --- a/lxc/etc/init.d/wirecon-web +++ b/lxc/etc/init.d/wirecon-web @@ -14,8 +14,8 @@ description="wirecon web UI (busybox httpd)" : "${WEB_ROOT:=/var/www/wirecon}" supervisor="supervise-daemon" -command="/bin/busybox" -command_args="httpd -f -v -p ${WEB_BIND}:${WEB_PORT} -h ${WEB_ROOT} -c /etc/wirecon/httpd.conf" +command="/usr/sbin/httpd" +command_args="-f -v -p ${WEB_BIND}:${WEB_PORT} -h ${WEB_ROOT} -c /etc/wirecon/httpd.conf" respawn_delay=5 respawn_max=0 output_log="/var/log/wirecon-web.log" diff --git a/lxc/install.sh b/lxc/install.sh index 738fe35..cf971e1 100755 --- a/lxc/install.sh +++ b/lxc/install.sh @@ -27,6 +27,7 @@ log "installing packages" apk add --no-cache \ bash \ nano \ + busybox-extras \ wireguard-tools \ wireguard-tools-openrc \ iptables \ @@ -85,52 +86,81 @@ if [[ ! -L /etc/init.d/wg-quick.wg0 ]]; then ln -s wg-quick /etc/init.d/wg-quick.wg0 fi +# --- env-driven defaults (propagated from create-lxc.sh / bootstrap.sh) ----- +: "${WIRECON_NET:=10.13.13.0/24}" +: "${WIRECON_PEER_IP:=10.13.13.1}" +: "${WIRECON_CLIENT_IP:=10.13.13.2}" +: "${WIRECON_LAN_CIDR:=192.168.1.0/24}" +: "${WIRECON_WEB_AUTOSTART:=yes}" + +# CIDR prefix (e.g. 24) — carry onto the client Address line. +WIRECON_NET_PREFIX="${WIRECON_NET##*/}" +[[ "$WIRECON_NET_PREFIX" == "$WIRECON_NET" ]] && WIRECON_NET_PREFIX=24 + if [[ ! -e /etc/wirecon/wirecon.conf ]]; then - log "installing default /etc/wirecon/wirecon.conf" + log "installing default /etc/wirecon/wirecon.conf (PEER_IP=$WIRECON_PEER_IP)" install -m 0644 "$SRC/etc/wirecon/wirecon.conf" /etc/wirecon/wirecon.conf + sed -i "s|^PEER_IP=.*|PEER_IP=${WIRECON_PEER_IP}|" /etc/wirecon/wirecon.conf else log "keeping existing /etc/wirecon/wirecon.conf" fi if [[ ! -e /etc/wireguard/wg0.conf ]]; then - log "seeding /etc/wireguard/wg0.conf from example (EDIT BEFORE STARTING)" - install -m 0600 "$SRC/etc/wireguard/wg0.conf.example" /etc/wireguard/wg0.conf - EDIT_REQUIRED=1 + log "generating placeholder /etc/wireguard/wg0.conf (edit keys via web UI or nano)" + umask 077 + cat > /etc/wireguard/wg0.conf </dev/null || true +rc-update add wirecon-watchdog default 2>/dev/null || true +rc-update add wirecon-monitor default 2>/dev/null || true -NEXT STEPS: - 1. Generate keys and edit /etc/wireguard/wg0.conf: - - [Interface] PrivateKey + MTU + PostUp LAN iface name - - [Peer] Server PublicKey + Endpoint - 2. Review /etc/wirecon/wirecon.conf (PEER_IP, thresholds). - 3. Start everything: - rc-update add wg-quick.wg0 default - rc-update add wirecon-watchdog default - rc-update add wirecon-monitor default - rc-update add wirecon-web default # optional, http://:8080 - rc-service wg-quick.wg0 start - rc-service wirecon-watchdog start - rc-service wirecon-monitor start - rc-service wirecon-web start - 4. Watch the logs: - tail -F /var/log/wirecon-watchdog.log /var/log/wirecon-monitor.log -EOF +rc-service wg-quick.wg0 start 2>/dev/null || log "wg-quick.wg0 failed to start (expected until keys are set in /etc/wireguard/wg0.conf)" +rc-service wirecon-watchdog start 2>/dev/null || true +rc-service wirecon-monitor start 2>/dev/null || true + +if [[ "$WIRECON_WEB_AUTOSTART" == "yes" ]]; then + rc-update add wirecon-web default 2>/dev/null || true + rc-service wirecon-web start 2>/dev/null || true + log "web UI enabled on http://:${WEB_PORT:-8080}/" else - log "enabling + (re)starting services" - rc-update add wg-quick.wg0 default 2>/dev/null || true - rc-update add wirecon-watchdog default 2>/dev/null || true - rc-update add wirecon-monitor default 2>/dev/null || true - rc-update add wirecon-web default 2>/dev/null || true - rc-service wg-quick.wg0 restart - rc-service wirecon-watchdog restart - rc-service wirecon-monitor restart - rc-service wirecon-web restart - log "done. UI: http://:${WEB_PORT:-8080}/ | logs: tail -F /var/log/wirecon-watchdog.log /var/log/wirecon-monitor.log" + log "web UI disabled (enable: rc-update add wirecon-web default && rc-service wirecon-web start)" fi + +log "done. logs: tail -F /var/log/wirecon-watchdog.log /var/log/wirecon-monitor.log" diff --git a/proxmox/create-lxc.sh b/proxmox/create-lxc.sh index a8bf0dc..9adc274 100755 --- a/proxmox/create-lxc.sh +++ b/proxmox/create-lxc.sh @@ -40,22 +40,39 @@ fi log() { printf '[create-lxc] %s\n' "$*"; } -# --- web UI autostart ------------------------------------------------------- -# WIRECON_WEB_AUTOSTART=yes|no overrides the prompt. Default: yes (the UI is -# how you'll edit wg0.conf / wirecon.conf without drop-to-shell). +# --- interactive prompts (web UI + WG network) ------------------------------ +# All settings can be preset via env vars; the prompt is skipped when set. +# WIRECON_WEB_AUTOSTART=yes|no, WIRECON_NET=CIDR, WIRECON_PEER_IP=ip, +# WIRECON_CLIENT_IP=ip. +_ask() { # _ask + local var="$1" prompt="$2" default="$3" ans="" + if [[ -n "${!var:-}" ]]; then return; fi + if [[ -r /dev/tty && -w /dev/tty ]]; then + printf '%s [%s]: ' "$prompt" "$default" >/dev/tty + IFS= read -r ans /dev/tty IFS= read -r _ans /dev/null' log "running bootstrap from $BOOTSTRAP_URL" -pct exec "$VMID" -- sh -c "curl -fsSL '$BOOTSTRAP_URL' | WIRECON_REPO='$WIRECON_REPO' WIRECON_REF='$WIRECON_REF' bash" +pct exec "$VMID" -- sh -c "curl -fsSL '$BOOTSTRAP_URL' \ + | WIRECON_REPO='$WIRECON_REPO' \ + WIRECON_REF='$WIRECON_REF' \ + WIRECON_NET='$WIRECON_NET' \ + WIRECON_PEER_IP='$WIRECON_PEER_IP' \ + WIRECON_CLIENT_IP='$WIRECON_CLIENT_IP' \ + WIRECON_LAN_CIDR='$WIRECON_LAN_CIDR' \ + WIRECON_WEB_AUTOSTART='$WIRECON_WEB_AUTOSTART' \ + bash" # --- tty1 auto-login (for Proxmox web Console) ------------------------------ # Drop a /usr/local/sbin/autologin-root wrapper and point getty at it so the @@ -152,13 +177,14 @@ pct exec "$VMID" -- sh -c ' pkill -KILL getty 2>/dev/null || true ' -# --- optional: start web UI ------------------------------------------------- +# --- final summary ---------------------------------------------------------- +# install.sh (run by bootstrap) has already enabled + started wg-quick, +# watchdog, monitor, and (if WIRECON_WEB_AUTOSTART=yes) the web UI. Keys +# aren't filled in yet — wg-quick will be failing until you edit wg0.conf +# in the web UI (or via the Proxmox Console). if [[ "$WIRECON_WEB_AUTOSTART" == "yes" ]]; then - log "enabling + starting wirecon-web" - pct exec "$VMID" -- sh -c 'rc-update add wirecon-web default && rc-service wirecon-web start' WEB_URL="http://${ip:-}:8080/" else - log "wirecon-web left disabled (enable later: rc-update add wirecon-web default && rc-service wirecon-web start)" WEB_URL="" fi @@ -168,12 +194,11 @@ cat <