mirror of
https://github.com/kellymichels/zscripts-token-savers
synced 2026-10-07 07:18:18 +00:00
c0d5708ad6
The README advertises macOS support, but the port used constructs that fail on the userland macOS actually ships: - `mapfile` (bash 4+) in 10 spots — macOS ships bash 3.2 as /usr/bin/bash, so a mac user following the README hit "mapfile: command not found" and silently got empty project lists. Replace each with a portable `while IFS= read -r` loop (identical arrays; set -u safe on empty input). - `_z_commafy` used the GNU-only `sed :a;...;ta` label/branch idiom, which errors on BSD/macOS sed (the token footer's thousands separators). Reimplement with awk (already a dependency). - README: correct the macOS line — bash 4+ does NOT ship with macOS; the stock 3.2 now works, and only jq needs brew. Also two correctness nits found in the same review: - zkill/zrestart `--kill-all` was parsed but silently ignored; now it prints a "not implemented in the bash port" notice instead of no-op. - zrepair's smoke-test line said "https://$domain" but probes http://$HOST with a Host header; label now matches what it does. Verified on WSL (bash 5): read-loops produce the same 11 project / 7 domain keys as mapfile; awk commafy matches across 0..1,234,567; empty producer yields a 0-length array; footer renders. 3.2-compat is by static analysis — no bash-4-only constructs remain.
81 lines
2.7 KiB
Bash
81 lines
2.7 KiB
Bash
#!/usr/bin/env bash
|
|
# Evomedia.net Token Savers — https://github.com/kellymichels/zscripts-token-savers
|
|
# Created by Kelly Michels · dev@evomedia.net
|
|
# Licensed under the MIT License. See LICENSE.
|
|
#
|
|
# zrepair — audit and repair container/proxy routing on the server, then smoke test.
|
|
#
|
|
# Usage:
|
|
# zrepair <project> [<project> ...]
|
|
#
|
|
# For each project: shows compose status, starts the stack if it's down,
|
|
# validates the edge proxy's nginx config (once, if an edge project is defined),
|
|
# and smoke-tests the live domain.
|
|
|
|
set -uo pipefail
|
|
source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/zhelpers.sh"
|
|
z_track_start "$@"
|
|
z_need_config
|
|
z_require ssh curl
|
|
|
|
if [ $# -eq 0 ]; then
|
|
printf '\n'; warn "Usage: zrepair <project> [<project> ...]"
|
|
dim " Projects in zconfig.json: $(zproj_csv)"
|
|
exit 1
|
|
fi
|
|
|
|
HOST="$(zec2_ip)"
|
|
|
|
printf '\n'; info "=== Routing repair & diagnostics ==="
|
|
dim "Target host: $HOST"
|
|
|
|
# Validate the edge proxy config once up front, if one is defined.
|
|
EDGE_KEY="$(zedge_key)"
|
|
if [ -n "$EDGE_KEY" ]; then
|
|
pc="$(zproj "$EDGE_KEY" .proxyContainer)"
|
|
if [ -n "$pc" ]; then
|
|
printf '\n'; warn " [edge] Validating nginx config in proxy container '$pc'..."
|
|
zec2_step "nginx -t in $pc" "sudo docker exec $pc nginx -t 2>&1" || exit 1
|
|
fi
|
|
fi
|
|
|
|
for key in "$@"; do
|
|
zproj_require "$key"
|
|
label="$(zproj "$key" .label)"; [ -n "$label" ] || label="$key"
|
|
compose_dir="$(zremote_compose_dir "$key")"
|
|
domain="$(zproj "$key" .domain)"
|
|
|
|
printf '\n'
|
|
info "========================================="
|
|
info "=== Repairing $label ($key) ==="
|
|
info "========================================="
|
|
printf '\n'
|
|
|
|
warn " [1/3] Compose status on the server..."
|
|
zec2_step "Check compose status" \
|
|
"cd $compose_dir || exit 1; echo 'Running containers:'; sudo docker compose ps" || exit 1
|
|
|
|
warn " [2/3] Ensuring stack is up..."
|
|
zec2_step "Ensure stack is up" \
|
|
"cd $compose_dir || exit 1; if ! sudo docker compose ps | grep -q Up; then echo ' [Action] Stack is down. Starting...'; sudo docker compose up -d; else echo ' [OK] Stack is active and UP.'; fi" || exit 1
|
|
|
|
if [ -n "$domain" ]; then
|
|
warn " [3/3] Smoke test for $domain (via http://$HOST)..."
|
|
code="$(http_code "http://$HOST/" "$domain")"
|
|
if [ "$code" = "000" ]; then
|
|
err " FAIL - smoke test failed: no HTTP response"
|
|
elif [ "$code" -lt 400 ]; then
|
|
ok " PASS - responded with HTTP $code (Online)"
|
|
elif [ "$code" -lt 500 ]; then
|
|
ok " PASS - responded with HTTP $code (Online/Redirect or auth)"
|
|
else
|
|
warn " WARNING - unexpected HTTP $code"
|
|
fi
|
|
else
|
|
warn " [3/3] No domain configured - skipping smoke test."
|
|
fi
|
|
done
|
|
|
|
printf '\n'; ok "=== Repair & diagnostics completed ==="
|
|
printf '\n'
|