diff --git a/CHANGELOG.md b/CHANGELOG.md index 97241e4..890e435 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,14 @@ for what changed inside the apps it composes. ## [Unreleased] +## [1.1.17] - 2026-07-18 + +### Bumped +- proxy -> [v1.1.15](https://github.com/theta42/proxy/releases/tag/v1.1.15) +- sso-manager-node -> [v1.1.15](https://github.com/theta42/sso-manager-node/releases/tag/v1.1.15) + +Both apps' bare-metal `install.sh` now installs to `/opt/theta42/` and seeds `/etc//secrets.js` on first run, matching a `wget -O - .../install.sh | sudo bash` one-line install for both (previously proxy-only); re-running it prints the version it's updating from/to. sso-manager-node's installer was rewritten from a flag-driven, copy-based script into the same idempotent git-clone pattern proxy already used, and now bootstraps OpenLDAP itself on first run instead of requiring the repo to already be checked out locally. None of this affects the Docker/unified-stack deployment this repo orchestrates — bare-metal-only. + ## [1.1.16] - 2026-07-18 ### Bumped @@ -206,7 +214,8 @@ First tagged release. Establishes the `vX.Y.Z` tag convention going forward. - proxy -> [v1.1.0](https://github.com/theta42/proxy/releases/tag/v1.1.0) - sso-manager-node -> [v1.1.0](https://github.com/theta42/sso-manager-node/releases/tag/v1.1.0) -[Unreleased]: https://github.com/theta42/theta-env/compare/v1.1.16...HEAD +[Unreleased]: https://github.com/theta42/theta-env/compare/v1.1.17...HEAD +[1.1.17]: https://github.com/theta42/theta-env/compare/v1.1.16...v1.1.17 [1.1.16]: https://github.com/theta42/theta-env/compare/v1.1.15...v1.1.16 [1.1.15]: https://github.com/theta42/theta-env/compare/v1.1.14...v1.1.15 [1.1.14]: https://github.com/theta42/theta-env/compare/v1.1.13...v1.1.14 diff --git a/proxy b/proxy index f0eadbc..c0e1aa6 160000 --- a/proxy +++ b/proxy @@ -1 +1 @@ -Subproject commit f0eadbc2d79b90d72dddbcc6ff97652e3d913b22 +Subproject commit c0e1aa666e22d603534c996ee7c681b131ee4f89 diff --git a/setup.sh b/setup.sh index fd3ce49..cbdba57 100755 --- a/setup.sh +++ b/setup.sh @@ -135,10 +135,12 @@ if [[ "${SKIP_SELF_UPDATE:-0}" != "1" && "${THETA_ENV_REEXECED:-0}" != "1" ]] \ && git rev-parse --abbrev-ref --symbolic-full-name '@{u}' >/dev/null 2>&1 then BEFORE_REV="$(git rev-parse HEAD)" + BEFORE_VER="$(git describe --tags "$BEFORE_REV" 2>/dev/null || echo "${BEFORE_REV:0:12}")" if git pull --ff-only -q; then AFTER_REV="$(git rev-parse HEAD)" if [[ "$BEFORE_REV" != "$AFTER_REV" ]]; then - info "Updated theta-env (${BEFORE_REV:0:12} -> ${AFTER_REV:0:12}) — restarting setup.sh with the new version..." + AFTER_VER="$(git describe --tags "$AFTER_REV" 2>/dev/null || echo "${AFTER_REV:0:12}")" + info "Updated theta-env (${BEFORE_VER} -> ${AFTER_VER}) — restarting setup.sh with the new version..." THETA_ENV_REEXECED=1 exec "$0" "$@" fi else @@ -165,26 +167,32 @@ if [[ "${SKIP_SUBMODULE_UPDATE:-0}" != "1" ]]; then for sm in sso-manager-node proxy; do [[ -d "$sm" ]] || continue before_rev="$(git -C "$sm" rev-parse HEAD 2>/dev/null || true)" + # Prefer the exact tag the submodule is currently pinned to; fall back + # to a short commit hash if it's on an untagged commit (shouldn't + # normally happen -- this repo only ever pins tagged releases). + before_tag="$(git -C "$sm" describe --tags --exact-match "$before_rev" 2>/dev/null || echo "${before_rev:0:12}")" if ! git -C "$sm" fetch --tags -q 2>&1; then - warn " ${sm}: could not fetch tags (offline?) — staying on the current pin." + warn " ${sm}: could not fetch tags (offline?) — staying on ${before_tag}." continue fi latest_tag="$(git -C "$sm" tag --list 'v*' --sort=-v:refname | head -n1)" if [[ -z "$latest_tag" ]]; then - warn " ${sm}: no vX.Y.Z release tags found — staying on the current pin." + warn " ${sm}: no vX.Y.Z release tags found — staying on ${before_tag}." continue fi if ! git -C "$sm" checkout -q "$latest_tag" 2>&1; then - warn " ${sm}: could not check out ${latest_tag} — staying on the current pin." + warn " ${sm}: could not check out ${latest_tag} — staying on ${before_tag}." continue fi after_rev="$(git -C "$sm" rev-parse HEAD 2>/dev/null || true)" if [[ "$before_rev" != "$after_rev" ]]; then - info " ${sm}: updated to ${latest_tag} (${before_rev:0:12} -> ${after_rev:0:12})" + info " ${sm}: updated ${before_tag} -> ${latest_tag}" + else + info " ${sm}: already up to date (${latest_tag})" fi done else diff --git a/sso-manager-node b/sso-manager-node index c5a2c0a..37f2ece 160000 --- a/sso-manager-node +++ b/sso-manager-node @@ -1 +1 @@ -Subproject commit c5a2c0a71df2d8ca65f9c6a541797f8236048271 +Subproject commit 37f2ece1724fdc22f271f86ab2100a2e620f952b