bunker-admin
23df6a8b52
Six independent fixes surfaced during the v2.9.1 → v2.9.2 admin-UI upgrade validation today. Together they make a clean install on a new box work end-to-end without in-session patching. - Fix 1: scripts/validate-compose-parity.sh + build-release.sh hook — fail release builds when api/admin/media-api/nginx healthcheck blocks drift between docker-compose.yml and docker-compose.prod.yml. Previous boot-race fix had to be applied to both files manually. - Fix 2: scripts/systemd/install.sh chowns logs/ to the install user (the API container creates subdirs there as root, locking the host-side watcher out), pre-creates logs/upgrade-watcher.log, and changemaker-upgrade.service adds StartLimitIntervalSec=0 so a single transient failure can't wedge the .path unit permanently. - Fix 3: /api/upgrade/status now returns a `watcher` sub-object that flags the host systemd watcher as stalled when trigger.json has been pending >30s. Admin SettingsPage SystemUpgradeTab renders a warning Alert with the systemctl recovery command when unhealthy. - Fix 4: scripts/upgrade.sh write_result() — prefer head -1 VERSION over `git rev-parse HEAD` so release-mode upgrades report the new tag in result.json instead of "unknown". - Fix 5: admin container healthcheck start_period 20s → 60s in both compose files, same class as the earlier api fix. Matches Gancio convention. - Fix 7: /api/pangolin/sync now detects resources bound to a stale siteId (common after --pangolin-site new rotations), deletes and recreates them against the current site, and reports them under a new `reassigned` response field. Bunker Admin
44 lines
1.5 KiB
Bash
Executable File
44 lines
1.5 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# =============================================================================
|
|
# Install Changemaker Lite systemd units
|
|
# Substitutes __PROJECT_DIR__ and __USER__ placeholders with actual values.
|
|
# Usage: sudo ./scripts/systemd/install.sh
|
|
# =============================================================================
|
|
set -euo pipefail
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
PROJECT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")"
|
|
INSTALL_USER="${SUDO_USER:-$(whoami)}"
|
|
|
|
if [[ $EUID -ne 0 ]]; then
|
|
echo "ERROR: Must run as root (use sudo)." >&2
|
|
exit 1
|
|
fi
|
|
|
|
echo "Installing systemd units..."
|
|
echo " Project dir: ${PROJECT_DIR}"
|
|
echo " User: ${INSTALL_USER}"
|
|
|
|
for unit in "${SCRIPT_DIR}"/changemaker-upgrade.*; do
|
|
filename="$(basename "$unit")"
|
|
sed \
|
|
-e "s|__PROJECT_DIR__|${PROJECT_DIR}|g" \
|
|
-e "s|__USER__|${INSTALL_USER}|g" \
|
|
"$unit" > "/etc/systemd/system/${filename}"
|
|
echo " Installed ${filename}"
|
|
done
|
|
|
|
# Ensure logs/ is writable by the install user. The API container creates
|
|
# subdirs here as root, which locks out the host-side upgrade-watcher service.
|
|
mkdir -p "${PROJECT_DIR}/logs"
|
|
chown "${INSTALL_USER}:${INSTALL_USER}" "${PROJECT_DIR}/logs"
|
|
touch "${PROJECT_DIR}/logs/upgrade-watcher.log"
|
|
chown "${INSTALL_USER}:${INSTALL_USER}" "${PROJECT_DIR}/logs/upgrade-watcher.log"
|
|
echo " Prepared ${PROJECT_DIR}/logs (owned by ${INSTALL_USER})"
|
|
|
|
systemctl daemon-reload
|
|
systemctl enable --now changemaker-upgrade.path
|
|
|
|
echo "Done. Status:"
|
|
systemctl status changemaker-upgrade.path --no-pager
|