ops: paivana and caddy config refresh
This commit is contained in:
parent
d8dbc6242b
commit
56f814a6de
74 changed files with 4517 additions and 79 deletions
|
|
@ -4,12 +4,12 @@
|
|||
#
|
||||
# Caddy file_server does NOT honor Apache .htaccess — this edits the Caddyfile.
|
||||
#
|
||||
# On koopa (password for sudo):
|
||||
# sudo -n true 2>/dev/null || sudo -v
|
||||
# sudo bash /home/hernani/koopa-admin-log/scripts/caddy/apply-dossiers-ngi-basicauth.sh
|
||||
# On koopa (clone admin-log from Forgejo when needed; no home git dump):
|
||||
# sudo bash /path/to/koopa-admin-log/scripts/caddy/apply-dossiers-ngi-basicauth.sh
|
||||
#
|
||||
# Idempotent. Password file is NOT in git:
|
||||
# /home/hernani/koopa-secrets/dossiers-ngi-basicauth.txt
|
||||
# Host runtime file (root-only, not under ~):
|
||||
# /etc/caddy/secrets/dossiers-ngi-basicauth.txt
|
||||
# SoT (git-crypt): koopa-admin-secrets-enc → koopa/home-hernani/caddy/
|
||||
set -euo pipefail
|
||||
|
||||
if [[ "$(id -u)" -ne 0 ]]; then
|
||||
|
|
@ -19,8 +19,9 @@ fi
|
|||
|
||||
CADDY=/etc/caddy/Caddyfile
|
||||
USER_NAME="${DOSSIERS_AUTH_USER:-hernani}"
|
||||
SECRETS_DIR=/home/hernani/koopa-secrets
|
||||
SECRETS_DIR=/etc/caddy/secrets
|
||||
PASS_FILE="${SECRETS_DIR}/dossiers-ngi-basicauth.txt"
|
||||
OLD_PASS_FILE=/home/hernani/koopa-secrets/dossiers-ngi-basicauth.txt
|
||||
SITES=(
|
||||
dossiers.ngi.hacktivism.ch
|
||||
dossiers.2.ngi.hacktivism.ch
|
||||
|
|
@ -34,9 +35,14 @@ fi
|
|||
command -v caddy >/dev/null || { echo "ERROR: caddy not in PATH" >&2; exit 1; }
|
||||
|
||||
mkdir -p "$SECRETS_DIR"
|
||||
chown hernani:hernani "$SECRETS_DIR"
|
||||
chmod 700 "$SECRETS_DIR"
|
||||
|
||||
if [[ ! -f "$PASS_FILE" && -f "$OLD_PASS_FILE" ]]; then
|
||||
cp -a "$OLD_PASS_FILE" "$PASS_FILE"
|
||||
chmod 600 "$PASS_FILE"
|
||||
echo "OK: migrated $OLD_PASS_FILE → $PASS_FILE"
|
||||
fi
|
||||
|
||||
if [[ -f "$PASS_FILE" ]]; then
|
||||
# shellcheck disable=SC1090
|
||||
# file format: USER=... PASS=... HASH=...
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue