Stabilize Caddy generation

scripts/deploy-app.sh

@@ -56,24 +56,24 @@ EOF
 
 fi
 
-if ! grep -q "apps/$APP_ID" "$BASE_DIR/gateway/Caddyfile"; then
+#if ! grep -q "apps/$APP_ID" "$BASE_DIR/gateway/Caddyfile"; then
-
+#
-TMP_FILE=$(mktemp)
+#TMP_FILE=$(mktemp)
-
+#
-sed '$d' "$CADDY_FILE" > "$TMP_FILE"
+#sed '$d' "$CADDY_FILE" > "$TMP_FILE"
-
+#
-cat >> "$TMP_FILE" <<EOF
+#cat >> "$TMP_FILE" <<EOF
-
+#
-    handle_path /apps/$APP_ID/* {
+#    handle_path /apps/$APP_ID/* {
-        reverse_proxy $APP_ID:8000
+#        reverse_proxy $APP_ID:8000
-    }
+#    }
-
+#
-}
+#}
-EOF
+#EOF
-
+#
-mv "$TMP_FILE" "$CADDY_FILE"
+#mv "$TMP_FILE" "$CADDY_FILE"
-
+#
-fi
+#fi
 
 echo "Restarting stack..."
 
@@ -99,6 +99,9 @@ cat >> "$CATALOG_FILE" <<EOF
 EOF
 fi
 
+"$HOME/workspace/appfactory-tools/scripts/generate-caddyfile.sh"
+"$HOME/workspace/appfactory-tools/scripts/generate-apps-page.sh"
+
 echo ""
 echo "DONE"
 echo ""

scripts/generate-caddyfile.sh

@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+BASE_DIR="/opt/appfactory"
+CATALOG_FILE="$BASE_DIR/apps/catalog.yml"
+CADDY_FILE="$BASE_DIR/gateway/Caddyfile"
+
+cat > "$CADDY_FILE" <<'EOF'
+:80 {
+    handle /health {
+        respond "AppFactory OK" 200
+    }
+
+    handle /portal* {
+        uri strip_prefix /portal
+        reverse_proxy appfactory-portal:9100
+    }
+
+    handle /apps {
+        root * /srv/static
+        rewrite * /apps.html
+        file_server
+    }
+
+EOF
+
+awk '
+  /- id:/ { print "    handle_path /apps/" $3 "/* {\n        reverse_proxy " $3 ":8000\n    }\n" }
+' "$CATALOG_FILE" >> "$CADDY_FILE"
+
+cat >> "$CADDY_FILE" <<'EOF'
+    handle_path /webhook/* {
+        reverse_proxy appfactory-webhook:9000
+    }
+
+    handle_path /registry/* {
+        reverse_proxy registry:5000
+    }
+
+    handle {
+        respond "AppFactory gateway is running" 200
+    }
+}
+EOF
+
+docker exec appfactory-caddy caddy reload --config /etc/caddy/Caddyfile || docker restart appfactory-caddy