mirror of
https://github.com/eduardogsilva/wireguard_webadmin.git
synced 2026-11-21 04:23:15 +01:00
Add certificate retry, optional fallback and DNS propagation fix to App Gateway hosts
This commit is contained in:
@@ -6,6 +6,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
PYTHON="python3"
|
||||
JSON_DIR="${JSON_DIR:-/caddy_json_export}"
|
||||
CADDYFILE_PATH="${CADDYFILE_PATH:-/etc/caddy/Caddyfile}"
|
||||
CADDY_PID=""
|
||||
|
||||
echo "==> Generating wireguard_webadmin.json..."
|
||||
"$PYTHON" "${SCRIPT_DIR}/export_wireguard_webadmin_config.py"
|
||||
@@ -19,12 +20,31 @@ generate_caddyfile() {
|
||||
fi
|
||||
}
|
||||
|
||||
sync_tls_state() {
|
||||
"$PYTHON" "${SCRIPT_DIR}/process_config.py" --sync-tls-state
|
||||
}
|
||||
|
||||
start_caddy() {
|
||||
caddy run --config "$CADDYFILE_PATH" --adapter caddyfile &
|
||||
CADDY_PID=$!
|
||||
}
|
||||
|
||||
stop_caddy() {
|
||||
kill "$CADDY_PID" 2>/dev/null || true
|
||||
for attempt in $(seq 1 10); do
|
||||
kill -0 "$CADDY_PID" 2>/dev/null || break
|
||||
sleep 1
|
||||
done
|
||||
kill -9 "$CADDY_PID" 2>/dev/null || true
|
||||
wait "$CADDY_PID" 2>/dev/null || true
|
||||
}
|
||||
|
||||
echo "==> Processing config files..."
|
||||
generate_caddyfile
|
||||
sync_tls_state >/dev/null
|
||||
|
||||
echo "==> Starting Caddy..."
|
||||
caddy run --config "$CADDYFILE_PATH" --adapter caddyfile &
|
||||
CADDY_PID=$!
|
||||
start_caddy
|
||||
|
||||
sleep 2
|
||||
|
||||
@@ -36,6 +56,13 @@ while true; do
|
||||
echo "==> Config change detected, reprocessing..."
|
||||
generate_caddyfile
|
||||
|
||||
echo "==> Reloading Caddy..."
|
||||
caddy reload --config "$CADDYFILE_PATH" --adapter caddyfile 2>/dev/null || echo "Warning: Caddy reload failed, will retry on next change."
|
||||
if [ "$(sync_tls_state)" = "restart" ]; then
|
||||
# A reload keeps previously issued certificates cached in memory
|
||||
echo "==> Certificate settings changed, restarting Caddy..."
|
||||
stop_caddy
|
||||
start_caddy
|
||||
else
|
||||
echo "==> Reloading Caddy..."
|
||||
caddy reload --config "$CADDYFILE_PATH" --adapter caddyfile 2>/dev/null || echo "Warning: Caddy reload failed, will retry on next change."
|
||||
fi
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user