diff --git a/CHANGELOG.md b/CHANGELOG.md index 74fec10..c21b382 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ orchestration code; see each submodule's own `CHANGELOG.md` [sso-manager-node](https://github.com/theta42/sso-manager-node/blob/master/CHANGELOG.md)) for what changed inside the apps it composes. +## [v1.35.2] - 2026-08-03 + +### Fixed +- **Unbound `CFG_CREATE_ALL_HTTP` variable in `setup.sh`** — Fixed unbound variable error during host registration in `setup.sh` when `ensure_secrets_files()` is skipped on pre-configured installations. + ## [v1.35.1] - 2026-08-03 ### Fixed diff --git a/setup.sh b/setup.sh index 8a29eec..9d06f25 100755 --- a/setup.sh +++ b/setup.sh @@ -178,6 +178,8 @@ fi # resolved in ensure_config; this is only the hostname override. [[ -f ./setup.env ]] && parse_kv_file ./setup.env export CFG_JUMP_HOST +CFG_CREATE_ALL_HTTP="${CFG_CREATE_ALL_HTTP:-0}" +export CFG_CREATE_ALL_HTTP # ── Optional outbound HTTP(S) proxy for docker build + the running containers ─ # CFG_HTTP_PROXY / CFG_HTTPS_PROXY / CFG_NO_PROXY (from ./setup.env or the @@ -978,7 +980,7 @@ async function ensureHost(host, ip, targetPort) { host: host, ip: ip, targetPort: targetPort, - forcessl: $( [[ "$CFG_CREATE_ALL_HTTP" == "1" ]] && echo false || echo true ), + forcessl: $( [[ "${CFG_CREATE_ALL_HTTP:-0}" == "1" ]] && echo false || echo true ), targetssl: false, sso_enabled: false, created_by: 'setup.sh', @@ -1035,7 +1037,7 @@ const {Host} = require('/app/models').models; try { await Host.get($(js_str "$JUMP_HOST")); console.log('SKIP ${JUMP_HOST} (already exists)'); } catch (e) { if (e.name !== 'EntryNotFound') throw e; - await Host.create({ host: $(js_str "$JUMP_HOST"), ip: 'jump-host', targetPort: 3002, forcessl: $( [[ "$CFG_CREATE_ALL_HTTP" == "1" ]] && echo false || echo true ), targetssl: false, sso_enabled: false, created_by: 'setup.sh' }); + await Host.create({ host: $(js_str "$JUMP_HOST"), ip: 'jump-host', targetPort: 3002, forcessl: $( [[ "${CFG_CREATE_ALL_HTTP:-0}" == "1" ]] && echo false || echo true ), targetssl: false, sso_enabled: false, created_by: 'setup.sh' }); console.log('CREATED ${JUMP_HOST} -> jump-host:3002'); } process.exit(0); @@ -1064,7 +1066,7 @@ if [[ "$CFG_THETA_AGENT_ENABLE" == "1" ]]; then AGENT_TOKEN="$(rand_hex 16)" sudo sed -i "s/REPLACE_WITH_AGENT_TOKEN/$AGENT_TOKEN/" /etc/theta/agent.yml # We want to connect to either https or http depending on CFG_CREATE_ALL_HTTP - if [[ "$CFG_CREATE_ALL_HTTP" == "1" ]]; then + if [[ "${CFG_CREATE_ALL_HTTP:-0}" == "1" ]]; then sudo sed -i "s|https://sso.example.com|http://${SSO_HOST}|" /etc/theta/agent.yml else sudo sed -i "s|https://sso.example.com|https://${SSO_HOST}|" /etc/theta/agent.yml