This commit is contained in:
parent
a1da3d5c52
commit
bfdf252239
2 changed files with 27 additions and 4 deletions
12
bin/disinto
12
bin/disinto
|
|
@ -746,6 +746,18 @@ p.write_text(text)
|
|||
touch "${FACTORY_ROOT}/.env"
|
||||
fi
|
||||
|
||||
# Configure Forgejo and Woodpecker subpath URLs when EDGE_TUNNEL_FQDN is set
|
||||
if [ -n "${EDGE_TUNNEL_FQDN:-}" ]; then
|
||||
# Forgejo ROOT_URL with /forge/ subpath (note trailing slash - Forgejo needs it)
|
||||
if ! grep -q '^FORGEJO_ROOT_URL=' "${FACTORY_ROOT}/.env" 2>/dev/null; then
|
||||
echo "FORGEJO_ROOT_URL=https://${EDGE_TUNNEL_FQDN}/forge/" >> "${FACTORY_ROOT}/.env"
|
||||
fi
|
||||
# Woodpecker WOODPECKER_HOST with /ci subpath (no trailing slash for v3)
|
||||
if ! grep -q '^WOODPECKER_HOST=' "${FACTORY_ROOT}/.env" 2>/dev/null; then
|
||||
echo "WOODPECKER_HOST=https://${EDGE_TUNNEL_FQDN}/ci" >> "${FACTORY_ROOT}/.env"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Prompt for FORGE_ADMIN_PASS before setup_forge
|
||||
# This ensures the password is set before Forgejo user creation
|
||||
prompt_admin_password "${FACTORY_ROOT}/.env"
|
||||
|
|
|
|||
|
|
@ -260,7 +260,7 @@ services:
|
|||
- forgejo-data:/data
|
||||
environment:
|
||||
FORGEJO__database__DB_TYPE: sqlite3
|
||||
FORGEJO__server__ROOT_URL: http://forgejo:3000/
|
||||
FORGEJO__server__ROOT_URL: ${FORGEJO_ROOT_URL:-http://forgejo:3000/}
|
||||
FORGEJO__server__HTTP_PORT: "3000"
|
||||
FORGEJO__security__INSTALL_LOCK: "true"
|
||||
FORGEJO__service__DISABLE_REGISTRATION: "true"
|
||||
|
|
@ -291,6 +291,7 @@ services:
|
|||
WOODPECKER_FORGEJO_CLIENT: ${WP_FORGEJO_CLIENT:-}
|
||||
WOODPECKER_FORGEJO_SECRET: ${WP_FORGEJO_SECRET:-}
|
||||
WOODPECKER_HOST: ${WOODPECKER_HOST:-http://woodpecker:8000}
|
||||
WOODPECKER_SERVER: http://woodpecker:9000
|
||||
WOODPECKER_OPEN: "true"
|
||||
WOODPECKER_AGENT_SECRET: ${WOODPECKER_AGENT_SECRET:-}
|
||||
WOODPECKER_DATABASE_DRIVER: sqlite3
|
||||
|
|
@ -553,8 +554,13 @@ _generate_caddyfile_impl() {
|
|||
# IP-only binding at bootstrap; domain + TLS added later via vault resource request
|
||||
|
||||
:80 {
|
||||
# Redirect root to Forgejo
|
||||
handle / {
|
||||
redir /forge/ 302
|
||||
}
|
||||
|
||||
# Reverse proxy to Forgejo
|
||||
handle /forgejo/* {
|
||||
handle /forge/* {
|
||||
reverse_proxy forgejo:3000
|
||||
}
|
||||
|
||||
|
|
@ -563,10 +569,15 @@ _generate_caddyfile_impl() {
|
|||
reverse_proxy woodpecker:8000
|
||||
}
|
||||
|
||||
# Default: proxy to staging container
|
||||
handle {
|
||||
# Reverse proxy to staging
|
||||
handle /staging/* {
|
||||
reverse_proxy staging:80
|
||||
}
|
||||
|
||||
# Chat placeholder — returns 503 until #705
|
||||
handle /chat/* {
|
||||
respond "chat not yet deployed" 503
|
||||
}
|
||||
}
|
||||
CADDYFILEEOF
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue