Put zapier.georgelambert.org service names on Caddy.
Some checks are pending
offline / test (push) Waiting to run
Some checks are pending
offline / test (push) Waiting to run
HTTPS reverse-proxy for portal, api, leaf, zap, staff, iam, login, cs, sales, acct, mw, and fleet. Staff HTML login redirects use X-Forwarded-Proto so next= is https on the public host.
This commit is contained in:
parent
bd94d6c208
commit
acf902e361
10 changed files with 118 additions and 11 deletions
|
|
@ -4,7 +4,8 @@ set -euo pipefail
|
|||
STACK="${VERAE_STACK:-$HOME/verae-stack}"
|
||||
FLEET="$STACK/packages/verae-fleet"
|
||||
EDGE_PORT="${EDGE_PORT:-13000}"
|
||||
export STAFF_IAM_URL="${STAFF_IAM_URL:-http://127.0.0.1:3028}"
|
||||
export STAFF_IAM_URL="${STAFF_IAM_URL:-https://iam.zapier.georgelambert.org}"
|
||||
export STAFF_COOKIE_DOMAIN="${STAFF_COOKIE_DOMAIN:-.zapier.georgelambert.org}"
|
||||
export NATS_URL="${NATS_URL:-nats://127.0.0.1:4222}"
|
||||
export FLEET_ENABLE_LAN134="${FLEET_ENABLE_LAN134:-}"
|
||||
test -d "$FLEET" || { echo "missing $FLEET" >&2; exit 1; }
|
||||
|
|
@ -45,17 +46,21 @@ for name in (
|
|||
"accounting-export",
|
||||
"access-staff",
|
||||
"access-web",
|
||||
"staff-iam",
|
||||
"staff-session",
|
||||
"zappier-edge",
|
||||
):
|
||||
p = root / "services" / f"{name}.json"
|
||||
if not p.exists():
|
||||
continue
|
||||
spec = json.loads(p.read_text())
|
||||
env = spec.setdefault("env", {})
|
||||
if "ZAPPIER_ADMIN_URL" in env or name != "access-web":
|
||||
if "ZAPPIER_ADMIN_URL" in env:
|
||||
env["ZAPPIER_ADMIN_URL"] = admin
|
||||
if name == "access-web":
|
||||
env["ZAPPIER_EDGE_URL"] = admin
|
||||
env["STAFF_IAM_URL"] = "http://127.0.0.1:3028"
|
||||
env["STAFF_IAM_URL"] = "https://iam.zapier.georgelambert.org"
|
||||
env["STAFF_COOKIE_DOMAIN"] = ".zapier.georgelambert.org"
|
||||
env["STAFF_AUTH"] = "1"
|
||||
p.write_text(json.dumps(spec, indent=2) + "\n")
|
||||
print("overlay applied edge", edge_port)
|
||||
|
|
@ -66,7 +71,7 @@ if curl -sf http://127.0.0.1:3850/health >/dev/null; then
|
|||
echo "fleet already up"
|
||||
exit 0
|
||||
fi
|
||||
nohup env STAFF_IAM_URL="$STAFF_IAM_URL" NATS_URL="$NATS_URL" node src/cli.js serve \
|
||||
nohup env STAFF_IAM_URL="$STAFF_IAM_URL" STAFF_COOKIE_DOMAIN="$STAFF_COOKIE_DOMAIN" NATS_URL="$NATS_URL" node src/cli.js serve \
|
||||
>/tmp/verae-fleet-serve.out 2>&1 &
|
||||
echo "fleet pid $!"
|
||||
for i in $(seq 1 40); do
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue