jknapp
6bb494c72f
Addresses the local code-review on the OLS-tier images: - [HIGH] ols-htaccess-watcher.sh: the debounce drain read ALL inotify events unfiltered, so on a busy multi-tenant server it never timed out and the restart was STARVED (rewrite changes silently never applied). Now coalesces with a hard DEBOUNCE-bounded window. Verified under continuous noise. - [HIGH] render-shared-ols-config.sh: built httpd_config.conf in-place across several appends, so a concurrent OLS restart (watcher) or parallel render could read a half-written config and 503 the whole tier. Now flock-serialized, built in a temp file and atomically moved into place; refuses to publish empty. - [MED] render + entrypoint: replaced recursive chown of the whole conf tree (O(N-sites) on every single-site change / boot) with a targeted chown of just the file written. - [MED] render: parse site.meta with sed instead of sourcing it (do not execute panel-written data as shell). - [cleanup] removed the unused configs/shared-ols/vhconf.tpl (the panel copy is the single source; the image never read it). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
74 lines
3.0 KiB
Bash
74 lines
3.0 KiB
Bash
#!/usr/bin/env bash
|
|
## ols-htaccess-watcher.sh — graceful-restart the shared OLS when any tenant's
|
|
## .htaccess changes. OLS reads .htaccess (RewriteFile) at (re)start, NOT per
|
|
## request, so without this a WordPress permalink/LiteSpeed-Cache change would
|
|
## silently not take effect. Required by spec 5.3.
|
|
##
|
|
## Watches all docroots for .htaccess writes, COALESCES bursts (a WP plugin save
|
|
## touches the file several times) within a debounce window, and RATE-LIMITS to
|
|
## a floor (one restart per FLOOR seconds) so many tenants saving at once can't
|
|
## trigger a restart storm. Debounce/floor are env-tunable (panel discloses the
|
|
## resulting "~60s" window to customers).
|
|
##
|
|
## Failure of THIS process is the silent-ticket failure mode (spec 7): if it
|
|
## dies, tenants' rewrite changes stop applying with no error. The entrypoint
|
|
## runs it and the panel monitors it (check-ols-htaccess-watcher.php).
|
|
set -uo pipefail
|
|
|
|
WATCH_ROOT="${OLS_WATCH_ROOT:-/mnt/users}"
|
|
DEBOUNCE="${OLS_HTACCESS_DEBOUNCE:-15}" # coalesce window (s)
|
|
FLOOR="${OLS_HTACCESS_FLOOR:-60}" # min seconds between restarts
|
|
LSWSCTRL=/usr/local/lsws/bin/lswsctrl
|
|
last_restart=0
|
|
|
|
log() { echo "ols-htaccess-watcher: $*" >&2; }
|
|
|
|
do_restart() {
|
|
now=$(date +%s)
|
|
if [ $((now - last_restart)) -lt "$FLOOR" ]; then
|
|
log "within ${FLOOR}s floor — coalescing, skipping restart"
|
|
return
|
|
fi
|
|
if "$LSWSCTRL" restart >/dev/null 2>&1; then
|
|
last_restart=$now
|
|
log "graceful restart issued (.htaccess change)"
|
|
else
|
|
log "WARNING: lswsctrl restart failed"
|
|
fi
|
|
}
|
|
|
|
if ! command -v inotifywait >/dev/null 2>&1; then
|
|
log "FATAL: inotifywait not installed (inotify-tools)"; exit 1
|
|
fi
|
|
mkdir -p "$WATCH_ROOT"
|
|
log "watching $WATCH_ROOT for .htaccess changes (debounce=${DEBOUNCE}s floor=${FLOOR}s)"
|
|
|
|
## -m monitor, -r recursive. We filter to .htaccess in the read loop rather than
|
|
## --include so this works on older inotify-tools too. modify/create/delete/move
|
|
## all matter (delete of .htaccess also changes rewrite behavior).
|
|
inotifywait -m -r -e modify,create,delete,move "$WATCH_ROOT" --format '%f' 2>/dev/null |
|
|
while read -r fname; do
|
|
case "$fname" in
|
|
.htaccess) ;;
|
|
*) continue ;;
|
|
esac
|
|
## A tenant .htaccess changed. Coalesce the save-burst, then restart ONCE.
|
|
##
|
|
## The coalesce is HARD-BOUNDED to DEBOUNCE seconds: a previous version blocked
|
|
## on `read -t DEBOUNCE` which, on a busy multi-tenant server, never timed out
|
|
## (unrelated file writes under $WATCH_ROOT kept resetting it) — so the restart
|
|
## was starved and rewrite changes silently never applied. Here we read further
|
|
## events only until the deadline OR ~2s of total quiet, whichever comes first,
|
|
## so continuous activity can delay us by at most DEBOUNCE. do_restart's FLOOR
|
|
## then rate-limits across consecutive bursts.
|
|
deadline=$(( $(date +%s) + DEBOUNCE ))
|
|
while [ "$(date +%s)" -lt "$deadline" ]; do
|
|
if read -r -t 2 _; then
|
|
continue # more activity — keep coalescing toward the deadline
|
|
else
|
|
break # ~2s of total quiet — the burst has settled
|
|
fi
|
|
done
|
|
do_restart
|
|
done
|