From bc4ab57f8b6799ca7f1b39274c86eb241dbd1b6e Mon Sep 17 00:00:00 2001 From: Jiri Uhlir Date: Wed, 27 May 2026 10:55:48 +0200 Subject: [PATCH] Stabilize Caddy and deploy generation --- scripts/generate-caddyfile.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/generate-caddyfile.sh b/scripts/generate-caddyfile.sh index 1382f0d..90095a0 100755 --- a/scripts/generate-caddyfile.sh +++ b/scripts/generate-caddyfile.sh @@ -27,7 +27,7 @@ cat > "$CADDY_FILE" <<'EOF_CADDY' EOF_CADDY awk ' - /- id:/ { + /^[[:space:]]*-[[:space:]]id:/ { print " handle_path /apps/" $3 "/* {" print " reverse_proxy " $3 ":8000" print " }" @@ -50,4 +50,11 @@ cat >> "$CADDY_FILE" <<'EOF_CADDY' } EOF_CADDY -docker exec appfactory-caddy caddy reload --config /etc/caddy/Caddyfile || docker restart appfactory-caddy +docker exec appfactory-caddy caddy validate --config /etc/caddy/Caddyfile + +if docker ps --format '{{.Names}}' | grep -q '^appfactory-caddy$'; then + docker exec appfactory-caddy caddy reload --config /etc/caddy/Caddyfile || docker restart appfactory-caddy +else + cd "$APPFACTORY_DIR/deploy" + docker compose -f docker-compose.yml up -d caddy +fi