mirror of
https://github.com/fscotto/infra.git
synced 2026-10-03 13:29:58 +00:00
Compare commits
8 Commits
9e76309833
...
18eb2d2eb2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
18eb2d2eb2 | ||
|
|
269fb13665 | ||
|
|
2dfe766b7b | ||
|
|
755f24bc72 | ||
|
|
7bc7f0e645 | ||
|
|
1577eec19d | ||
|
|
e30683c3d1 | ||
|
|
4bd6aafb53 |
131
AGENTS.md
131
AGENTS.md
@@ -25,6 +25,9 @@ Ansible-driven personal infrastructure repo for Fedora and Void desktops, Fedora
|
|||||||
- Preserve layering `all -> platform -> role -> desktop -> host`.
|
- Preserve layering `all -> platform -> role -> desktop -> host`.
|
||||||
- Keep `ansible/site.yml` small; orchestration belongs there, implementation belongs in roles.
|
- Keep `ansible/site.yml` small; orchestration belongs there, implementation belongs in roles.
|
||||||
- Prefer minimal, targeted edits. Preserve idempotency and existing ordering.
|
- Prefer minimal, targeted edits. Preserve idempotency and existing ordering.
|
||||||
|
- Keep completed one-time cleanup operations out of the playbook. Execute them directly
|
||||||
|
with explicit authorization; retain only the ongoing desired-state configuration and
|
||||||
|
historical documentation, not permanent cleanup flags or tasks.
|
||||||
- Use Git Flow branch prefixes: `feature/` for new functionality, `bugfix/` for non-urgent fixes,
|
- Use Git Flow branch prefixes: `feature/` for new functionality, `bugfix/` for non-urgent fixes,
|
||||||
`hotfix/` for urgent production fixes, `release/` for release preparation, and `support/` for
|
`hotfix/` for urgent production fixes, `release/` for release preparation, and `support/` for
|
||||||
maintained release lines. Do not use abbreviated prefixes such as `feat/`.
|
maintained release lines. Do not use abbreviated prefixes such as `feat/`.
|
||||||
@@ -54,11 +57,17 @@ Ansible-driven personal infrastructure repo for Fedora and Void desktops, Fedora
|
|||||||
- Emacs is disabled by default; temporary Emacs check: `ansible-playbook ansible/site.yml --limit <host> --tags emacs --check --diff -e emacs_enabled=true`
|
- Emacs is disabled by default; temporary Emacs check: `ansible-playbook ansible/site.yml --limit <host> --tags emacs --check --diff -e emacs_enabled=true`
|
||||||
- AI coding agents: `ansible-playbook ansible/site.yml --limit <host> --tags ai_agents --check --diff`
|
- AI coding agents: `ansible-playbook ansible/site.yml --limit <host> --tags ai_agents --check --diff`
|
||||||
- Mail bootstrap: `sh -n scripts/bootstrap_mail.sh` and `shellcheck scripts/bootstrap_mail.sh`
|
- Mail bootstrap: `sh -n scripts/bootstrap_mail.sh` and `shellcheck scripts/bootstrap_mail.sh`
|
||||||
- Server compose render: `podman-compose -f /opt/docker/server/docker-compose.yml config` and `systemctl status podman-compose-server`
|
- Server NPM Quadlet: `systemctl status prometheus-npm.service`; the Compose fallback is retired.
|
||||||
|
- Explicit Prometheus legacy cleanup (destructive only without check mode):
|
||||||
|
`ansible-playbook ansible/site.yml --limit prometheus --tags server_legacy_cleanup --check --diff -e server_legacy_cleanup=true`
|
||||||
- Atlas media stack:
|
- Atlas media stack:
|
||||||
`ansible-playbook ansible/site.yml --limit atlas --tags storage,sharing,containers --check --diff`
|
`ansible-playbook ansible/site.yml --limit atlas --tags storage,sharing,containers --check --diff`
|
||||||
- Atlas rootless Gitea staging (does not start Gitea):
|
- Atlas rootless Gitea staging (does not start Gitea):
|
||||||
`ansible-playbook ansible/site.yml --limit atlas --tags gitea --check --diff`
|
`ansible-playbook ansible/site.yml --limit atlas --tags gitea --check --diff`
|
||||||
|
- Atlas canonical Gitea domain (restarts only Gitea on a real configuration change):
|
||||||
|
`ansible-playbook ansible/site.yml --limit atlas --tags gitea_public_domain --check --diff`
|
||||||
|
- Atlas iCloudPD storage and boot-started Quadlet:
|
||||||
|
`ansible-playbook ansible/site.yml --limit atlas --tags icloudpd --check --diff`
|
||||||
- Atlas explicit Gitea host-owner migration (live outage; never a normal run):
|
- Atlas explicit Gitea host-owner migration (live outage; never a normal run):
|
||||||
`ansible-playbook ansible/site.yml --limit atlas --tags gitea_owner_migration -e atlas_gitea_owner_migration=true`
|
`ansible-playbook ansible/site.yml --limit atlas --tags gitea_owner_migration -e atlas_gitea_owner_migration=true`
|
||||||
- Atlas explicit isolated Gitea restore rehearsal (not part of normal runs):
|
- Atlas explicit isolated Gitea restore rehearsal (not part of normal runs):
|
||||||
@@ -88,7 +97,9 @@ Ansible-driven personal infrastructure repo for Fedora and Void desktops, Fedora
|
|||||||
`ansible-playbook ansible/site.yml --limit atlas --tags restorecon --check -e '{"atlas_restorecon_paths":["/zpool/archive"]}'`
|
`ansible-playbook ansible/site.yml --limit atlas --tags restorecon --check -e '{"atlas_restorecon_paths":["/zpool/archive"]}'`
|
||||||
- Prometheus/Aegis WireGuard gateway:
|
- Prometheus/Aegis WireGuard gateway:
|
||||||
`ansible-playbook ansible/site.yml --limit prometheus,aegis --tags wireguard --check --diff`
|
`ansible-playbook ansible/site.yml --limit prometheus,aegis --tags wireguard --check --diff`
|
||||||
- DuckDNS config only: `ansible-playbook ansible/site.yml --limit prometheus --tags duckdns --check --diff`
|
- Prometheus NPM Quadlet steady state (does not perform a cutover):
|
||||||
|
`ansible-playbook ansible/site.yml --limit prometheus --tags npm_quadlet --check --diff`
|
||||||
|
- DuckDNS config only (skipped on Prometheus): `ansible-playbook ansible/site.yml --limit prometheus --tags duckdns --check --diff`
|
||||||
|
|
||||||
## Conventions
|
## Conventions
|
||||||
- Use FQCN Ansible modules.
|
- Use FQCN Ansible modules.
|
||||||
@@ -132,16 +143,24 @@ The dotfile vars follow the same split: `desktop_common_dotfiles` carries mode-i
|
|||||||
- Windows applications are installed manually and are not managed from the WSL profile.
|
- Windows applications are installed manually and are not managed from the WSL profile.
|
||||||
|
|
||||||
## Rocky Server Notes
|
## Rocky Server Notes
|
||||||
- DuckDNS is rendered by `profile_server` from host-local `server_duckdns_domain` and
|
- Prometheus disables DuckDNS provisioning with `server_duckdns_enabled: false`. Its updater,
|
||||||
|
log and five-minute cron entry were explicitly retired; the external DuckDNS name and Vault
|
||||||
|
token remain untouched. The completed one-time cleanup has no remaining playbook tasks.
|
||||||
|
- When enabled, DuckDNS is rendered by `profile_server` from host-local `server_duckdns_domain` and
|
||||||
`vault_duckdns_token`. Keep the rotated token in encrypted Vault or untracked local vars, never in
|
`vault_duckdns_token`. Keep the rotated token in encrypted Vault or untracked local vars, never in
|
||||||
dotfiles. The private `~/duckdns/duck.sh` keeps the existing entrypoint; rendering uses `no_log`
|
dotfiles. The private `~/duckdns/duck.sh` keeps the existing entrypoint; rendering uses `no_log`
|
||||||
and disables diffs. Provisioning does not execute the updater or change its external schedule.
|
and disables diffs. Provisioning does not execute the updater or change its external schedule.
|
||||||
- `rocky_server` is a child of both `platform_rocky` and `server`; `prometheus` is its active target.
|
- `rocky_server` is a child of both `platform_rocky` and `server`; `prometheus` is its active target.
|
||||||
- The target must already provide `server_username` with local sudo access before the profile runs.
|
- The target must already provide `server_username` with local sudo access before the profile runs.
|
||||||
- The Rocky profile installs Podman and podman-compose, uses firewalld, preserves SELinux enforcement, and renders the
|
- The Rocky profile installs Podman and podman-compose. Prometheus explicitly retires the legacy
|
||||||
existing Nginx Proxy Manager/Gitea Compose stack with a `podman-compose-server` systemd unit. PostgreSQL and
|
Compose unit, files and final-export helper with `server_legacy_stack_retired: true`.
|
||||||
Navidrome are no longer part of the desired Prometheus configuration. The role does not stop or remove legacy
|
Its approved opt-in cleanup removed old application data on 2026-10-03; normal runs do not
|
||||||
containers, delete `/opt/postgres/data`, start the Compose stack, update DNS, or cut over traffic.
|
delete data or recreate the retired files. On Prometheus, Nginx Proxy Manager is now the rootful
|
||||||
|
`prometheus-npm.service` Quadlet with a pinned image digest and the existing `/opt/npm/data` and
|
||||||
|
`/opt/npm/letsencrypt` bind mounts. The rootful `server_web` bridge remains `10.89.0.0/24`.
|
||||||
|
Gitea runs on Atlas; PostgreSQL and Navidrome are absent from the desired Prometheus stack.
|
||||||
|
Normal runs do not delete legacy data, update DNS, or perform an implicit cutover;
|
||||||
|
destructive cleanup requires its explicit tag and opt-in extra-var.
|
||||||
- Firewalld enables SSH, Cockpit (`9090/tcp`), HTTP and HTTPS. Nginx Proxy Manager publishes `80/tcp` and
|
- Firewalld enables SSH, Cockpit (`9090/tcp`), HTTP and HTTPS. Nginx Proxy Manager publishes `80/tcp` and
|
||||||
`443/tcp`; bind its administration interface only to `127.0.0.1:81` and use `npm-tunnel` from Ikaros or Nymph.
|
`443/tcp`; bind its administration interface only to `127.0.0.1:81` and use `npm-tunnel` from Ikaros or Nymph.
|
||||||
Nextcloud remains disabled; do not provision `/srv/nextcloud` directories.
|
Nextcloud remains disabled; do not provision `/srv/nextcloud` directories.
|
||||||
@@ -350,23 +369,99 @@ successfully. The first monthly scrub remains a runtime check.
|
|||||||
- [x] Validate authenticated SSH pull and push. On 2026-10-02 the operator reported both
|
- [x] Validate authenticated SSH pull and push. On 2026-10-02 the operator reported both
|
||||||
operations working through the public SSH endpoint; the earlier agent-run `git ls-remote`
|
operations working through the public SSH endpoint; the earlier agent-run `git ls-remote`
|
||||||
remains the independent read-only check. The agent did not perform a test push.
|
remains the independent read-only check. The agent did not perform a test push.
|
||||||
- [ ] Validate HTTPS write/login before declaring the full cutover complete. The
|
- [x] Validate Gitea login and write via HTTPS. On 2026-10-03 the operator confirmed
|
||||||
secondary NPM hostname `git.ov-ad3410.infomaniak.ch` did not resolve from Ikaros and had
|
authenticated web login and Git clone/pull/push through the public HTTPS endpoint. Do not
|
||||||
no generated NPM config file at the previous inspection. Do not restart the stale source
|
restart the stale source Gitea after Atlas has accepted writes.
|
||||||
Gitea after Atlas has accepted writes.
|
|
||||||
- [ ] Design and deploy Nextcloud as another explicitly temporary Atlas service before Uranus. Give it
|
- [ ] Design and deploy Nextcloud as another explicitly temporary Atlas service before Uranus. Give it
|
||||||
separate persistent application, database, and cache storage; keep credentials in Vault; publish it only
|
separate persistent application, database, and cache storage; keep credentials in Vault; publish it only
|
||||||
through NPM over the Prometheus--Aegis gateway; and define backup, upgrade, and eventual Uranus-migration
|
through NPM over the Prometheus--Aegis gateway; and define backup, upgrade, and eventual Uranus-migration
|
||||||
procedures before exposing user data. Do not deploy Nextcloud before the data-protection checklist is complete.
|
procedures before exposing user data. Do not deploy Nextcloud before the data-protection checklist is complete.
|
||||||
|
- [x] Move Gitea canonical HTTPS and SSH hostname to `git.fscotto.co` on
|
||||||
|
2026-10-03 through Ansible. Only Gitea restarted; second run changed nothing.
|
||||||
|
HTTPS and authenticated SSH reads returned the same repository HEAD.
|
||||||
|
The new NPM hostnames passed TLS/HTTP checks; old DuckDNS Proxy Hosts were
|
||||||
|
observed disabled. Details are in `docs/domain-fscotto-co.md`.
|
||||||
|
- [x] Confirm login on the new Gitea hostname and update remaining client remotes/integrations.
|
||||||
|
The operator confirmed completion on 2026-10-03; the agent did not perform a test push.
|
||||||
|
- [x] Remove obsolete DuckDNS NPM Proxy Hosts, unused certificates and the old upstream override.
|
||||||
|
The operator confirmed completion on 2026-10-03; no new agent runtime check was performed.
|
||||||
|
- [x] Review and remove completed one-time procedures from the playbook.
|
||||||
|
The operator confirmed completion on 2026-10-03.
|
||||||
|
- [x] Retire Prometheus' local DuckDNS updater on 2026-10-03 through Ansible:
|
||||||
|
the five-minute cron entry and private updater/log directory were removed.
|
||||||
|
Provisioning is disabled; repeat cleanup changed nothing. HTTPS services, private NPM
|
||||||
|
administration and the export timer stayed healthy. The external name and Vault token
|
||||||
|
remain untouched for possible future use on a local host.
|
||||||
- [ ] Keep `atlas_manage_media_stack` disabled until the future Immich deployment has validated `/dev/dri`,
|
- [ ] Keep `atlas_manage_media_stack` disabled until the future Immich deployment has validated `/dev/dri`,
|
||||||
container paths, and the required Vault database secret.
|
container paths, and the required Vault database secret.
|
||||||
|
|
||||||
### Priority 4 - Optional workflows
|
### Priority 4 - Optional workflows
|
||||||
- [ ] After data protection is validated, move iCloudPD photo ingestion from Aegis to Atlas as a
|
- [x] Deploy the declared Atlas iCloudPD state dataset and inactive rootless `admin` Quadlet.
|
||||||
temporary service until Uranus is ready. Plan to store photos in `/zpool/archive/Pictures` and
|
Photos belong under `/zpool/archive/Pictures/iCloudPD`; private config/MFA state belongs in
|
||||||
persistent application/MFA state outside `Archive`; validate permissions, SELinux, backups and
|
`zpool/services/data/icloudpd`. Photobook remains reserved for Immich. Ansible now renders
|
||||||
recovery before cutover. Keep the current Aegis service and Photobook NFS export unchanged until
|
`icloudpd.conf` with the Apple ID from the existing Vault key, but does not store the password
|
||||||
the Atlas workflow is tested, then retire them explicitly if no longer needed.
|
or manage MFA. Automatic startup was approved on 2026-10-03; the Quadlet now
|
||||||
|
uses `WantedBy=default.target` and Ansible keeps the service running.
|
||||||
|
The isolated no-network layout test is documented in
|
||||||
|
`docs/atlas-icloudpd-migration.md`. On 2026-10-02 Atlas deployment and a second idempotent run
|
||||||
|
passed; no app config existed at deployment. A manual first start on 2026-10-02 generated
|
||||||
|
`icloudpd.conf`; an Ansible run then replaced it with a private mode-0600 Vault-backed template
|
||||||
|
and an idempotent second run. The image later expanded the config, so Ansible now seeds it
|
||||||
|
only when absent and maintains the declared fields. Its launcher requires `traceroute`; the
|
||||||
|
rootless Quadlet grants only `NET_RAW`, tested in isolation and after restart. The service
|
||||||
|
was subsequently initialized interactively; initial ingestion is tracked below.
|
||||||
|
- [x] Retire Aegis iCloudPD completely. The operator authorized deleting its Quadlet,
|
||||||
|
`/var/lib/icloudpd` data, and MFA state despite an unaudited container overlay. After two
|
||||||
|
interactive-sudo runs on 2026-10-02, the unit is `not-found`/`inactive`, the Quadlet and state
|
||||||
|
directory are absent, and AdGuard remains active. The temporary retirement tasks have since
|
||||||
|
been removed from the Aegis role; it no longer manages iCloudPD.
|
||||||
|
- [x] Validate Atlas iCloudPD authentication and initial ingestion. On 2026-10-03 the active
|
||||||
|
rootless service logged `All photos and videos have been downloaded` at 02:16 and reported
|
||||||
|
completion for the user. The destination held 11,658 files (86,020,430,015 bytes); the preceding 24h
|
||||||
|
logs showed download activity without authentication failures or errors. A later read-only check
|
||||||
|
found the service still active. This confirms the initial download, not the next daily cycle.
|
||||||
|
- [x] Declare HEIC decoding for Fedora graphical desktops without converting the originals on Atlas.
|
||||||
|
The Fedora role installs RPM Fusion Free with a pinned signing-key fingerprint and
|
||||||
|
`libheif-freeworld` on Ikaros and Nymph. The package was confirmed installed on Ikaros on
|
||||||
|
2026-10-03; Nymph deployment and an actual image-opening test were not observed.
|
||||||
|
- [ ] Validate Atlas iCloudPD filesystem/SELinux/SMB access, the next daily sync, ZFS/Borg/USB
|
||||||
|
backup inclusion, and isolated restore of photos and private state. A recursive hourly snapshot
|
||||||
|
of `zpool/archive` exists after ingestion, but no iCloudPD-specific backup version or restore
|
||||||
|
has been verified. The first monthly scrub remains a separate open data-protection check.
|
||||||
|
|
||||||
|
## Prometheus NPM Quadlet cutover
|
||||||
|
- [x] Stage a rootful NPM Quadlet using the exact running image and the existing data/certificate
|
||||||
|
mounts, bridge subnet, public HTTP/HTTPS ports, and loopback-only administration port.
|
||||||
|
The generated service depends on `server-web-network.service` and is wanted by `multi-user.target`.
|
||||||
|
- [x] Take and verify the stopped-source export before switching owners. Version
|
||||||
|
`20261003T091009Z` was pulled to Atlas and its NPM SQLite database checked in isolation.
|
||||||
|
- [x] Cut over NPM to `prometheus-npm.service` on 2026-10-03. The legacy Compose unit is inactive
|
||||||
|
and disabled; the Quadlet is active with zero recorded restarts. Public Gitea and Syncthing
|
||||||
|
HTTPS returned 200 with valid TLS, while public TCP/81 remained unreachable.
|
||||||
|
- [x] Validate the post-cutover backup path. The export and Atlas pull published
|
||||||
|
`20261003T091633Z`; checksum, SQLite `quick_check`, ten proxy hosts, six certificate records,
|
||||||
|
both Quadlet files were present, and the complete Let's Encrypt tree (70 regular files plus
|
||||||
|
12 symlinks) matched the live data. A targeted normal Ansible run changed nothing. Details and rollback
|
||||||
|
boundaries are in `docs/prometheus-npm-quadlet.md`.
|
||||||
|
- [x] Remove only unused Gitea, Navidrome and PostgreSQL images with opt-in
|
||||||
|
Ansible tasks on 2026-10-03. Second run changed nothing; NPM stayed active
|
||||||
|
with zero restarts, HTTP/HTTPS passed, backup timer and SSH proxy stayed active.
|
||||||
|
This image-only step preserved data and fallback; the later approved deletion is tracked below. Validation:
|
||||||
|
`ansible-playbook ansible/site.yml --limit prometheus --tags server_image_cleanup --check --diff -e server_legacy_image_cleanup=true`
|
||||||
|
- [x] Complete explicitly approved old-data and Compose fallback removal on 2026-10-03.
|
||||||
|
Backup paths and mount dependencies were reconciled before deletion; repeat cleanup changed
|
||||||
|
nothing. The normal Compose/template/helper check did not recreate retired files.
|
||||||
|
A separately approved manual export/pull published `20261003T112906Z`; checksum and isolated
|
||||||
|
SQLite restore passed with ten proxy hosts and both Quadlet definitions. NPM, primary HTTPS,
|
||||||
|
WireGuard, SSH proxy and backup timer remained healthy; existing backup archives were preserved.
|
||||||
|
- [x] Retire the unused secondary Gitea hostname `git.ov-ad3410.infomaniak.ch`
|
||||||
|
on 2026-10-03. Its NPM Proxy Host was already soft-deleted and had no
|
||||||
|
associated certificate. Its Ansible domain and runtime override were removed;
|
||||||
|
nginx -t and reload passed without restarting NPM. Primary HTTPS returned 200
|
||||||
|
with valid TLS. At that step only `git.fscotto.duckdns.org` remained declared;
|
||||||
|
the subsequent domain transition and operator-confirmed cleanup are tracked above.
|
||||||
|
- [ ] Observe the first scheduled export and Atlas pull after the cutover; the manual end-to-end
|
||||||
|
cycle passed, but the next unattended cycle has not yet occurred.
|
||||||
|
|
||||||
## Cerberus Management Node (Deferred)
|
## Cerberus Management Node (Deferred)
|
||||||
`cerberus` is postponed until the office in the new house is physically set up. It is not an inventory
|
`cerberus` is postponed until the office in the new house is physically set up. It is not an inventory
|
||||||
@@ -442,5 +537,5 @@ validated exports of older historical data will use a dedicated Atlas NFS datase
|
|||||||
`/etc/resolv.conf` linked to `/run/systemd/resolve/resolv.conf`. LAN clients may use AdGuard, but
|
`/etc/resolv.conf` linked to `/run/systemd/resolve/resolv.conf`. LAN clients may use AdGuard, but
|
||||||
Aegis must use the independent upstream DNS declared by `aegis_host_dns_servers` so Greenboot does
|
Aegis must use the independent upstream DNS declared by `aegis_host_dns_servers` so Greenboot does
|
||||||
not depend on the AdGuard container during startup.
|
not depend on the AdGuard container during startup.
|
||||||
- iCloudPD requires post-deployment interactive MFA initialization; its cookie/configuration state is
|
- Aegis iCloudPD has been retired and is no longer managed by this role. Its service, Quadlet,
|
||||||
persisted in `/var/lib/icloudpd/config`.
|
data, and MFA state were removed with the operator's explicit authorization.
|
||||||
|
|||||||
63
README.it.md
63
README.it.md
@@ -182,6 +182,10 @@ Le applicazioni Windows sono installate e gestite manualmente; il profilo WSL no
|
|||||||
|
|
||||||
## Server
|
## Server
|
||||||
|
|
||||||
|
La migrazione dei servizi pubblici a `fscotto.co`, la gestione Ansible
|
||||||
|
degli URL Gitea e i passaggi ancora aperti per ritirare DuckDNS sono in
|
||||||
|
[`docs/domain-fscotto-co.md`](docs/domain-fscotto-co.md).
|
||||||
|
|
||||||
Sistema operativo:
|
Sistema operativo:
|
||||||
|
|
||||||
- Rocky Linux 9
|
- Rocky Linux 9
|
||||||
@@ -201,28 +205,37 @@ Lo stato attuale del profilo server include:
|
|||||||
- installazione pacchetti Rocky via DNF, EPEL e CRB
|
- installazione pacchetti Rocky via DNF, EPEL e CRB
|
||||||
- installazione di Podman e podman-compose
|
- installazione di Podman e podman-compose
|
||||||
- abilitazione dei servizi systemd dichiarati in inventory/group vars
|
- abilitazione dei servizi systemd dichiarati in inventory/group vars
|
||||||
- copia dei dotfiles server e rendering del `docker-compose.yml` per Nginx Proxy Manager e Gitea,
|
- copia dei dotfiles server e rendering del Quadlet rootful `prometheus-npm.service` per Nginx Proxy
|
||||||
piu l'unita `podman-compose-server` (attivazione manuale)
|
Manager; il vecchio fallback Compose è stato rimosso con autorizzazione esplicita
|
||||||
- attivazione di firewalld con SSH, Cockpit (`9090/tcp`), HTTP e HTTPS abilitati
|
- attivazione di firewalld con SSH, Cockpit (`9090/tcp`), HTTP e HTTPS abilitati
|
||||||
- Syncthing escluso dal profilo server Rocky
|
- Syncthing escluso dal profilo server Rocky
|
||||||
|
|
||||||
Il Compose desiderato su Prometheus non include piu Navidrome ne il database PostgreSQL obsoleto.
|
Il 2026-10-03 la pulizia opt-in autorizzata ha rimosso dati e immagini precedenti di Gitea,
|
||||||
Navidrome e Syncthing appartengono ad Atlas; Navidrome ufficiale usa invece SQLite. Il profilo non
|
Navidrome e PostgreSQL, directory obsolete vuote, helper finale Gitea e fallback Compose NPM.
|
||||||
arresta o rimuove automaticamente eventuali container legacy e non elimina `/opt/postgres/data`.
|
I servizi migrati restano su Atlas. `server_legacy_stack_retired: true` evita che i normali task
|
||||||
|
ricreino i residui; la cancellazione richiede `--tags server_legacy_cleanup` e
|
||||||
|
`-e server_legacy_cleanup=true`. NPM attivo e archivi di backup restano intatti.
|
||||||
|
Export, pull Atlas e restore SQLite isolato post-pulizia sono riusciti; il primo ciclo automatico
|
||||||
|
resta da osservare. Evidenze e confini del recovery:
|
||||||
|
[`docs/prometheus-npm-quadlet.md`](docs/prometheus-npm-quadlet.md).
|
||||||
|
|
||||||
Nginx Proxy Manager pubblica solo `80/tcp` e `443/tcp`; la sua interfaccia di amministrazione e
|
Nginx Proxy Manager pubblica solo `80/tcp` e `443/tcp`; la sua interfaccia di amministrazione e
|
||||||
associata a `127.0.0.1:81` ed e raggiungibile da Ikaros o Nymph con l'alias Bash `npm-tunnel`.
|
associata a `127.0.0.1:81` ed e raggiungibile da Ikaros o Nymph con l'alias Bash `npm-tunnel`.
|
||||||
Nextcloud resta disabilitato e il profilo non crea directory `/srv/nextcloud`.
|
Nextcloud resta disabilitato e il profilo non crea directory `/srv/nextcloud`.
|
||||||
|
|
||||||
La fase 1 su Atlas non modifica questo deployment NPM ne i suoi dati persistenti. Dopo aver attivato
|
La fase 1 su Atlas non modifica i dati persistenti NPM. I proxy host NPM usano gli upstream LAN
|
||||||
WireGuard e i servizi Atlas, configurare i proxy host NPM correnti con upstream Navidrome
|
`http://192.168.178.55:4533` per Navidrome e `http://192.168.178.55:8384` per la GUI Syncthing;
|
||||||
`http://10.0.0.2:4533` e upstream per la GUI Syncthing `http://10.0.0.2:8384`. Solo la GUI web di
|
Prometheus li raggiunge attraverso Aegis come gateway WireGuard. Solo la GUI web di Syncthing usa
|
||||||
Syncthing usa NPM; il traffico di sincronizzazione resta sulle porte native pubblicate esplicitamente solo
|
NPM; il traffico di sincronizzazione resta sulle porte native esposte sulla LAN dichiarata.
|
||||||
sull'indirizzo WireGuard di Atlas. Configurare l'autenticazione Syncthing e una policy di accesso NPM adeguata prima di pubblicare la GUI.
|
Mantenere l'autenticazione Syncthing e una policy di accesso NPM adeguata.
|
||||||
|
|
||||||
### DuckDNS
|
### DuckDNS
|
||||||
|
|
||||||
`profile_server` genera `~/duckdns/duck.sh` con permessi `0700`, mantenendo il percorso dello
|
`server_duckdns_enabled: false` disabilita il provisioning su Prometheus, che usa IP statico
|
||||||
|
e `fscotto.co`. Updater, log e cron ogni cinque minuti sono stati rimossi una sola volta;
|
||||||
|
non restano task o flag di pulizia. Il nome DuckDNS esterno e il token Vault restano invariati.
|
||||||
|
|
||||||
|
Sui server con `server_duckdns_enabled: true`, `profile_server` genera `~/duckdns/duck.sh` con permessi `0700`, mantenendo il percorso dello
|
||||||
script e `duck.log`. Definire `server_duckdns_domain` negli host vars del server e salvare il
|
script e `duck.log`. Definire `server_duckdns_domain` negli host vars del server e salvare il
|
||||||
**nuovo token rigenerato** in `vault_duckdns_token`, nel Vault cifrato `secrets/vault.yml`
|
**nuovo token rigenerato** in `vault_duckdns_token`, nel Vault cifrato `secrets/vault.yml`
|
||||||
(`ansible-vault edit secrets/vault.yml`) oppure negli override non versionati `secrets/vault.local.yml`.
|
(`ansible-vault edit secrets/vault.yml`) oppure negli override non versionati `secrets/vault.local.yml`.
|
||||||
@@ -332,7 +345,7 @@ La migrazione Gitea da Prometheus ad Atlas è descritta in
|
|||||||
di `admin` su un dataset dedicato; l'immagine derivata mantiene UID/GID 1000 ma chiama l'utente
|
di `admin` su un dataset dedicato; l'immagine derivata mantiene UID/GID 1000 ma chiama l'utente
|
||||||
interno `gitea`. NPM resta su Prometheus e l'HTTPS pubblico primario serve Atlas. L'SSH pubblico
|
interno `gitea`. NPM resta su Prometheus e l'HTTPS pubblico primario serve Atlas. L'SSH pubblico
|
||||||
su TCP/2222 autentica la chiave `ikaros` e un `git ls-remote` è riuscito; l'operatore ha
|
su TCP/2222 autentica la chiave `ikaros` e un `git ls-remote` è riuscito; l'operatore ha
|
||||||
confermato pull e push SSH. Resta da provare la scrittura via HTTPS. I dati sorgente restano
|
confermato pull e push SSH. Login e scrittura Git via HTTPS sono stati confermati il 2026-10-03. I dati sorgente restano
|
||||||
conservati su Prometheus senza avviarne il vecchio container.
|
conservati su Prometheus senza avviarne il vecchio container.
|
||||||
|
|
||||||
Validare il gateway con:
|
Validare il gateway con:
|
||||||
@@ -517,8 +530,9 @@ viene recuperato quando il timer torna attivo.
|
|||||||
|
|
||||||
`atlas-usb-backup.service` **non ha timer** e va avviato manualmente. Il timer del fornitore
|
`atlas-usb-backup.service` **non ha timer** e va avviato manualmente. Il timer del fornitore
|
||||||
`zfs-scrub-weekly@zpool.timer` è disabilitato a favore dello scrub mensile. Il timer di preparazione
|
`zfs-scrub-weekly@zpool.timer` è disabilitato a favore dello scrub mensile. Il timer di preparazione
|
||||||
su Prometheus è attivo alle 02:00 Europe/Rome; export, pull e ripristino temporaneo manuali sono
|
su Prometheus è attivo alle 02:00 Europe/Rome; il primo ciclo pianificato è riuscito il 2026-10-01.
|
||||||
riusciti il 2026-09-30, ma il primo ciclo pianificato va ancora verificato. Durante un backup Borg attivo,
|
Un export, pull e ripristino temporaneo post-cutover NPM Quadlet sono riusciti il 2026-10-03;
|
||||||
|
il primo ciclo pianificato dopo quel cutover resta da osservare. Durante un backup Borg attivo,
|
||||||
`systemctl list-timers` può mostrare `-` per il prossimo evento senza che il timer sia disabilitato.
|
`systemctl list-timers` può mostrare `-` per il prossimo evento senza che il timer sia disabilitato.
|
||||||
Per vedere la pianificazione corrente: `systemctl list-timers --all` su Atlas.
|
Per vedere la pianificazione corrente: `systemctl list-timers --all` su Atlas.
|
||||||
|
|
||||||
@@ -527,12 +541,15 @@ della protezione dei dati: richiede storage applicativo, database e cache separa
|
|||||||
pubblicazione solo tramite NPM e Aegis, procedure di backup, aggiornamento e migrazione. Non
|
pubblicazione solo tramite NPM e Aegis, procedure di backup, aggiornamento e migrazione. Non
|
||||||
distribuirlo prima di completare la checklist di protezione dei dati.
|
distribuirlo prima di completare la checklist di protezione dei dati.
|
||||||
|
|
||||||
La destinazione futura per l'importazione foto iCloud è Atlas, non Aegis. Dopo la validazione dei
|
Atlas è la destinazione dichiarata per iCloudPD. Ansible gestisce dataset, Quadlet rootless e
|
||||||
backup, pianificare una migrazione esplicita di iCloudPD con foto sotto `/zpool/archive/Pictures` e
|
`icloudpd.conf` privato con Apple ID dal Vault: foto in `/zpool/archive/Pictures/iCloudPD`,
|
||||||
stato applicativo/MFA fuori da `Archive`; testare permessi, SELinux, backup e restore prima del
|
stato in `zpool/services/data/icloudpd`. Il primo avvio è stato manuale; password e MFA restano
|
||||||
cutover. L'attuale iCloudPD su Aegis e l'export NFS Photobook restano configurati fino
|
gestiti interattivamente, senza avvio automatico al boot. L'inizializzazione è stata completata e
|
||||||
all'approvazione e alla verifica di questa migrazione separata. Anche il servizio Atlas sarà
|
il download iniziale di foto e video è terminato il 2026-10-03. Su Aegis
|
||||||
temporaneo in attesa di Uranus.
|
il servizio, il Quadlet e `/var/lib/icloudpd` sono stati rimossi e verificati; il playbook Aegis
|
||||||
|
non contiene più task iCloudPD. L'accesso SMB e il ripristino dai backup dei nuovi dati restano
|
||||||
|
da verificare. L'export NFS Photobook resta
|
||||||
|
invariato. Dettagli in [`docs/atlas-icloudpd-migration.md`](docs/atlas-icloudpd-migration.md).
|
||||||
|
|
||||||
Il primo ciclo pianificato del backup di Prometheus e una prova di disaster recovery a dimensione reale
|
Il primo ciclo pianificato del backup di Prometheus e una prova di disaster recovery a dimensione reale
|
||||||
restano da verificare. Il 2026-09-30 una VM Rocky isolata ha superato ricostruzione OS con Ansible,
|
restano da verificare. Il 2026-09-30 una VM Rocky isolata ha superato ricostruzione OS con Ansible,
|
||||||
@@ -635,8 +652,8 @@ Questo significa che, allo stato attuale:
|
|||||||
- `deadalus` riceve il profilo Fedora WSL tramite play dev dedicati
|
- `deadalus` riceve il profilo Fedora WSL tramite play dev dedicati
|
||||||
- il server Rocky (`prometheus`) e gestito con pacchetti, servizi, dotfiles server e firewalld
|
- il server Rocky (`prometheus`) e gestito con pacchetti, servizi, dotfiles server e firewalld
|
||||||
- il NAS Rocky (`atlas`) usa un pool ZFS gia esistente, condivisioni NFSv4/SMB limitate alla LAN e Cockpit/45Drives
|
- il NAS Rocky (`atlas`) usa un pool ZFS gia esistente, condivisioni NFSv4/SMB limitate alla LAN e Cockpit/45Drives
|
||||||
- lo stack Compose server include soltanto `gitea` e `nginx-proxy-manager`; Navidrome e Syncthing
|
- NPM è un Quadlet rootful su Prometheus, mentre Gitea, Navidrome e Syncthing sono Quadlet
|
||||||
della fase 1 sono Quadlet rootless su Atlas
|
rootless su Atlas; il fallback Compose server è stato rimosso
|
||||||
|
|
||||||
# Dotfiles
|
# Dotfiles
|
||||||
|
|
||||||
@@ -742,7 +759,7 @@ ansible-playbook ansible/site.yml --limit <host> --tags <tag1>,<tag2> --check --
|
|||||||
ansible-playbook ansible/site.yml --limit <host> --start-at-task "<task name>" --check --diff
|
ansible-playbook ansible/site.yml --limit <host> --start-at-task "<task name>" --check --diff
|
||||||
ansible-lint ansible/roles/<role>
|
ansible-lint ansible/roles/<role>
|
||||||
yamllint ansible/path/to/file.yml
|
yamllint ansible/path/to/file.yml
|
||||||
podman-compose -f /opt/docker/server/docker-compose.yml config
|
ansible-playbook ansible/site.yml --limit prometheus --tags server_legacy_cleanup --check --diff -e server_legacy_cleanup=true
|
||||||
ansible-playbook ansible/site.yml --limit atlas --tags storage,sharing,containers --check --diff
|
ansible-playbook ansible/site.yml --limit atlas --tags storage,sharing,containers --check --diff
|
||||||
ansible-playbook ansible/site.yml --limit atlas --tags backend_phase1 --check --diff
|
ansible-playbook ansible/site.yml --limit atlas --tags backend_phase1 --check --diff
|
||||||
ansible-playbook ansible/site.yml --limit atlas --tags music_sync --check --diff
|
ansible-playbook ansible/site.yml --limit atlas --tags music_sync --check --diff
|
||||||
|
|||||||
65
README.md
65
README.md
@@ -125,16 +125,26 @@ That gives it Fedora packages through DNF, Docker from the official repository,
|
|||||||
|
|
||||||
## Server
|
## Server
|
||||||
|
|
||||||
|
The public service domain transition to `fscotto.co`, Gitea canonical URL
|
||||||
|
management, and remaining DuckDNS retirement steps are documented in
|
||||||
|
[`docs/domain-fscotto-co.md`](docs/domain-fscotto-co.md).
|
||||||
|
|
||||||
`prometheus` is the Rocky Linux 9 server. It has no graphical environment and gets server-specific
|
`prometheus` is the Rocky Linux 9 server. It has no graphical environment and gets server-specific
|
||||||
dotfiles and templates. The profile provisions configuration only: it does not transfer data, start
|
dotfiles and templates. The profile does not transfer application data, update DNS, or perform an
|
||||||
the Compose stack, update DNS, or perform a cutover.
|
implicit service cutover.
|
||||||
|
|
||||||
The server profile installs platform-specific packages, Podman and podman-compose, declared systemd
|
The server profile installs platform-specific packages, Podman and podman-compose, declared systemd
|
||||||
services, and firewalld. The manually activated `podman-compose-server` unit contains the existing
|
services, and firewalld. Nginx Proxy Manager runs as the rootful `prometheus-npm.service` Quadlet.
|
||||||
Nginx Proxy Manager and Gitea services. The desired Compose file no longer includes Navidrome,
|
On 2026-10-03 the operator-approved opt-in cleanup removed old Gitea, Navidrome and PostgreSQL
|
||||||
Syncthing, or the obsolete Navidrome PostgreSQL database; their temporary Atlas deployment is managed
|
data/images, empty legacy directories, the Gitea final-export helper and the Compose rollback files.
|
||||||
by `profile_backend_phase1`. Applying the profile does not stop or remove legacy containers and does
|
The migrated services stay on Atlas. `server_legacy_stack_retired: true` prevents normal runs from
|
||||||
not delete `/opt/postgres/data`.
|
recreating retired files. Data deletion requires `--tags server_legacy_cleanup` and
|
||||||
|
`-e server_legacy_cleanup=true`; image-only cleanup has its own `server_image_cleanup` tag and flag.
|
||||||
|
Active NPM resources and existing backup archives remain preserved.
|
||||||
|
The post-cleanup export/pull and isolated SQLite restore passed; the first unattended cycle remains
|
||||||
|
pending. Evidence and recovery boundaries:
|
||||||
|
[`docs/prometheus-npm-quadlet.md`](docs/prometheus-npm-quadlet.md).
|
||||||
|
|
||||||
|
|
||||||
Firewalld enables SSH, Cockpit (`9090/tcp`), HTTP and HTTPS. Nginx Proxy Manager publishes only
|
Firewalld enables SSH, Cockpit (`9090/tcp`), HTTP and HTTPS. Nginx Proxy Manager publishes only
|
||||||
`80/tcp` and `443/tcp`; its administration interface is bound to `127.0.0.1:81` and can be reached
|
`80/tcp` and `443/tcp`; its administration interface is bound to `127.0.0.1:81` and can be reached
|
||||||
@@ -161,7 +171,11 @@ Prometheus authorizes its declared SSH public keys through separate files below
|
|||||||
|
|
||||||
### DuckDNS
|
### DuckDNS
|
||||||
|
|
||||||
`profile_server` renders `~/duckdns/duck.sh` with mode `0700`, keeping the existing updater path
|
`server_duckdns_enabled: false` disables provisioning on Prometheus, which uses its static IP
|
||||||
|
and `fscotto.co`. The local updater, log and five-minute cron job were removed once;
|
||||||
|
no cleanup tasks or flags remain. The external DuckDNS name and Vault token remain untouched.
|
||||||
|
|
||||||
|
For servers with `server_duckdns_enabled: true`, `profile_server` renders `~/duckdns/duck.sh` with mode `0700`, keeping the existing updater path
|
||||||
and `duck.log`. Set `server_duckdns_domain` in the server's host vars and store the **rotated**
|
and `duck.log`. Set `server_duckdns_domain` in the server's host vars and store the **rotated**
|
||||||
`vault_duckdns_token` in encrypted `secrets/vault.yml` (using `ansible-vault edit secrets/vault.yml`)
|
`vault_duckdns_token` in encrypted `secrets/vault.yml` (using `ansible-vault edit secrets/vault.yml`)
|
||||||
or untracked `secrets/vault.local.yml`. Never commit the rendered script or put the token on a
|
or untracked `secrets/vault.local.yml`. Never commit the rendered script or put the token on a
|
||||||
@@ -210,8 +224,8 @@ ansible/bootstrap/generate-aegis-ign.sh --write IMAGE DEVICE
|
|||||||
```
|
```
|
||||||
|
|
||||||
The controller manages it remotely as `pi@aegis`; unlike local desktop profiles, Aegis is
|
The controller manages it remotely as `pi@aegis`; unlike local desktop profiles, Aegis is
|
||||||
intentionally an SSH inventory target. `profile_aegis` manages rootful Podman Quadlets for AdGuard
|
intentionally an SSH inventory target. `profile_aegis` manages a rootful Podman Quadlet for AdGuard
|
||||||
Home and iCloudPD, persistent data under `/var/lib`, the Podman auto-update timer, LAN-restricted
|
Home, its persistent data under `/var/lib`, the Podman auto-update timer, LAN-restricted
|
||||||
firewalld rules, SSH key-only access for `pi`, the `nfs-utils` and `wireguard-tools` rpm-ostree layers,
|
firewalld rules, SSH key-only access for `pi`, the `nfs-utils` and `wireguard-tools` rpm-ostree layers,
|
||||||
and `wake-ikaros`. `wireguard_overlay` makes Aegis the internal endpoint and LAN gateway for Prometheus:
|
and `wake-ikaros`. `wireguard_overlay` makes Aegis the internal endpoint and LAN gateway for Prometheus:
|
||||||
it enables persistent IPv4 forwarding, installs a scoped WireGuard-to-LAN firewalld policy, and source-NATs
|
it enables persistent IPv4 forwarding, installs a scoped WireGuard-to-LAN firewalld policy, and source-NATs
|
||||||
@@ -224,9 +238,8 @@ opened and closed manually during initial setup. The profile disables the local
|
|||||||
stub and points `/etc/resolv.conf` to its full resolver data, freeing port 53 for AdGuard. LAN clients
|
stub and points `/etc/resolv.conf` to its full resolver data, freeing port 53 for AdGuard. LAN clients
|
||||||
may use AdGuard on Aegis, while Aegis itself uses the independent upstream DNS declared by
|
may use AdGuard on Aegis, while Aegis itself uses the independent upstream DNS declared by
|
||||||
`aegis_host_dns_servers`; this prevents Greenboot from depending on the AdGuard container during
|
`aegis_host_dns_servers`; this prevents Greenboot from depending on the AdGuard container during
|
||||||
startup. Reboot Aegis after changing its NetworkManager DNS profile. Define
|
startup. Reboot Aegis after changing its NetworkManager DNS profile. iCloudPD was retired from Aegis;
|
||||||
`vault_aegis_icloudpd_apple_id` in Vault before applying it. iCloudPD still requires interactive MFA
|
the Aegis role no longer contains iCloudPD tasks. Atlas iCloudPD config is Vault-backed; MFA is manual.
|
||||||
initialization after its first deployment.
|
|
||||||
|
|
||||||
New Aegis images create the `admin` account in Butane. Before configuring a newly imaged node, run its
|
New Aegis images create the `admin` account in Butane. Before configuring a newly imaged node, run its
|
||||||
first playbook execution with `-e ansible_user=admin`; the SSH hardening role then permits that same
|
first playbook execution with `-e ansible_user=admin`; the SSH hardening role then permits that same
|
||||||
@@ -306,9 +319,9 @@ The Gitea move from Prometheus to Atlas is tracked in
|
|||||||
[`docs/atlas-gitea-migration.md`](docs/atlas-gitea-migration.md). The final consistent copy runs in
|
[`docs/atlas-gitea-migration.md`](docs/atlas-gitea-migration.md). The final consistent copy runs in
|
||||||
Atlas' dedicated dataset under `admin`'s rootless user Quadlet. Its pinned derived image uses an
|
Atlas' dedicated dataset under `admin`'s rootless user Quadlet. Its pinned derived image uses an
|
||||||
internal Unix user named `gitea` (UID/GID 1000), while clone URLs keep `git@`. NPM remains on Prometheus and the primary
|
internal Unix user named `gitea` (UID/GID 1000), while clone URLs keep `git@`. NPM remains on Prometheus and the primary
|
||||||
public HTTPS route serves Atlas. Public SSH/2222 now authenticates the `ikaros` key and serves
|
public HTTPS route serves Atlas. Public SSH/2222 authenticates the `ikaros` key and serves
|
||||||
read-only `git ls-remote`; the operator also confirmed SSH pull and push. HTTPS writes remain
|
`git ls-remote`; the operator also confirmed SSH pull and push. HTTPS login and Git writes were
|
||||||
untested. The old Gitea data remains on Prometheus, but its container
|
confirmed on 2026-10-03. The old Gitea data remains on Prometheus, but its container
|
||||||
is absent from the desired stack.
|
is absent from the desired stack.
|
||||||
|
|
||||||
The separate `wireguard_overlay` role manages `wg0` between Prometheus (`10.0.0.1`) and Aegis
|
The separate `wireguard_overlay` role manages `wg0` between Prometheus (`10.0.0.1`) and Aegis
|
||||||
@@ -532,8 +545,9 @@ scheduled after the timer becomes active again.
|
|||||||
|
|
||||||
`atlas-usb-backup.service` has **no timer**: the encrypted USB backup must be started manually.
|
`atlas-usb-backup.service` has **no timer**: the encrypted USB backup must be started manually.
|
||||||
The vendor's `zfs-scrub-weekly@zpool.timer` is intentionally disabled in favor of the monthly scrub.
|
The vendor's `zfs-scrub-weekly@zpool.timer` is intentionally disabled in favor of the monthly scrub.
|
||||||
The Prometheus export timer runs at 02:00 Europe/Rome; its first scheduled run and the Atlas pull
|
The Prometheus export timer runs at 02:00 Europe/Rome. Its first scheduled export and Atlas pull
|
||||||
remain to be observed. A manual export, pull, and temporary restore passed. While a
|
passed on 2026-10-01; a manual post-NPM-Quadlet export, pull, and temporary restore passed on
|
||||||
|
2026-10-03. The first scheduled cycle after that cutover remains to be observed. While a
|
||||||
Borg backup is still running, `systemctl list-timers` may show `-` for its next trigger; this does not
|
Borg backup is still running, `systemctl list-timers` may show `-` for its next trigger; this does not
|
||||||
mean the timer has been disabled. Inspect the current schedule on Atlas with
|
mean the timer has been disabled. Inspect the current schedule on Atlas with
|
||||||
`systemctl list-timers --all`.
|
`systemctl list-timers --all`.
|
||||||
@@ -543,11 +557,14 @@ declared persistent application, database, and cache storage, Vault-backed crede
|
|||||||
publishing through Aegis, and defined backup, upgrade, and eventual migration procedures. Do not deploy
|
publishing through Aegis, and defined backup, upgrade, and eventual migration procedures. Do not deploy
|
||||||
it before the data-protection checklist is complete.
|
it before the data-protection checklist is complete.
|
||||||
|
|
||||||
The desired future iCloud photo-ingestion host is Atlas, not Aegis. After data-protection validation,
|
Atlas is the declared iCloud photo-ingestion host. Ansible manages the rootless Quadlet, a private
|
||||||
plan an explicit iCloudPD migration with photos under `/zpool/archive/Pictures` and application/MFA
|
Vault-backed `icloudpd.conf`, photos under `/zpool/archive/Pictures/iCloudPD`, and separate state in
|
||||||
state outside `Archive`, then test permissions, SELinux, backups and recovery before cutting over.
|
`zpool/services/data/icloudpd`. The service was started manually; Ansible does not enable automatic
|
||||||
The current Aegis iCloudPD service and Atlas Photobook NFS export remain configured until that
|
startup or manage the password and MFA keyring. The operator initialized MFA interactively; on
|
||||||
separate migration is approved and validated; the eventual Atlas service is temporary until Uranus.
|
2026-10-03 the initial photo/video download completed. Aegis iCloudPD, including its service data,
|
||||||
|
has been removed and verified; the Aegis role no longer manages it. Backup/restore and SMB access
|
||||||
|
for the new data remain unverified. The Photobook NFS export remains untouched. See
|
||||||
|
[`docs/atlas-icloudpd-migration.md`](docs/atlas-icloudpd-migration.md).
|
||||||
|
|
||||||
The first scheduled Prometheus backup runs and production-size disaster-recovery tests remain follow-up work. The prioritized
|
The first scheduled Prometheus backup runs and production-size disaster-recovery tests remain follow-up work. The prioritized
|
||||||
operational backlog is kept in `AGENTS.md`.
|
operational backlog is kept in `AGENTS.md`.
|
||||||
@@ -733,7 +750,7 @@ ansible-playbook ansible/site.yml --limit <host> --tags <tag1>,<tag2> --check --
|
|||||||
ansible-playbook ansible/site.yml --limit <host> --start-at-task "<task name>" --check --diff
|
ansible-playbook ansible/site.yml --limit <host> --start-at-task "<task name>" --check --diff
|
||||||
ansible-lint ansible/roles/<role>
|
ansible-lint ansible/roles/<role>
|
||||||
yamllint ansible/path/to/file.yml
|
yamllint ansible/path/to/file.yml
|
||||||
podman-compose -f /opt/docker/server/docker-compose.yml config
|
ansible-playbook ansible/site.yml --limit prometheus --tags server_legacy_cleanup --check --diff -e server_legacy_cleanup=true
|
||||||
ansible-playbook ansible/site.yml --limit atlas --tags storage,sharing,containers --check --diff
|
ansible-playbook ansible/site.yml --limit atlas --tags storage,sharing,containers --check --diff
|
||||||
ansible-playbook ansible/site.yml --limit atlas --tags music_sync --check --diff
|
ansible-playbook ansible/site.yml --limit atlas --tags music_sync --check --diff
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -6,6 +6,11 @@ effective_username: "{{ server_username }}"
|
|||||||
effective_user_group: "{{ server_user_group }}"
|
effective_user_group: "{{ server_user_group }}"
|
||||||
effective_user_home: "{{ server_user_home }}"
|
effective_user_home: "{{ server_user_home }}"
|
||||||
server_container_stack_dir: /opt/docker/server
|
server_container_stack_dir: /opt/docker/server
|
||||||
|
server_npm_quadlet_stage: false
|
||||||
|
server_npm_quadlet_cutover: false
|
||||||
|
server_legacy_stack_retired: false
|
||||||
|
server_legacy_cleanup: false
|
||||||
|
server_duckdns_enabled: true
|
||||||
ai_agents: {}
|
ai_agents: {}
|
||||||
vim_plugins_enabled: false
|
vim_plugins_enabled: false
|
||||||
|
|
||||||
@@ -99,9 +104,13 @@ server_backup_export_source_keep: 3
|
|||||||
server_backup_export_paths: >-
|
server_backup_export_paths: >-
|
||||||
{{ ['opt/npm/data', 'opt/npm/letsencrypt']
|
{{ ['opt/npm/data', 'opt/npm/letsencrypt']
|
||||||
+ ([] if server_gitea_on_atlas | bool else ['opt/gitea/data', 'home/git/.ssh'])
|
+ ([] if server_gitea_on_atlas | bool else ['opt/gitea/data', 'home/git/.ssh'])
|
||||||
+ ['opt/docker/server/docker-compose.yml',
|
+ ([] if server_legacy_stack_retired | bool else
|
||||||
'etc/systemd/system/podman-compose-server.service',
|
['opt/docker/server/docker-compose.yml',
|
||||||
'etc/ssh/sshd_config', 'etc/ssh/sshd_config.d',
|
'etc/systemd/system/podman-compose-server.service'])
|
||||||
|
+ (['etc/containers/systemd/prometheus-npm.container',
|
||||||
|
'etc/containers/systemd/server-web.network']
|
||||||
|
if server_npm_quadlet_stage | bool else [])
|
||||||
|
+ ['etc/ssh/sshd_config', 'etc/ssh/sshd_config.d',
|
||||||
'etc/firewalld', 'etc/wireguard/wg0.conf'] }}
|
'etc/firewalld', 'etc/wireguard/wg0.conf'] }}
|
||||||
server_backup_export_excludes: >-
|
server_backup_export_excludes: >-
|
||||||
{{ ['opt/npm/data/logs']
|
{{ ['opt/npm/data/logs']
|
||||||
|
|||||||
@@ -42,5 +42,3 @@ aegis_ssh_authorized_keys:
|
|||||||
key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEH/7GJfGt0ZVmKeEzceoFkFkeCXFryKK9vAbaip+HCx nymph"
|
key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEH/7GJfGt0ZVmKeEzceoFkFkeCXFryKK9vAbaip+HCx nymph"
|
||||||
- name: siren
|
- name: siren
|
||||||
key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA95wYlzpfN3rjUhpMeP4KHn8I6ZrjQXoDTgwgRIa++b siren"
|
key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA95wYlzpfN3rjUhpMeP4KHn8I6ZrjQXoDTgwgRIa++b siren"
|
||||||
|
|
||||||
aegis_icloudpd_apple_id: "{{ vault_aegis_icloudpd_apple_id | default('') }}"
|
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ atlas_manage_storage: true
|
|||||||
# Rootless Gitea was restored from the stopped-source export before production activation.
|
# Rootless Gitea was restored from the stopped-source export before production activation.
|
||||||
atlas_manage_gitea: true
|
atlas_manage_gitea: true
|
||||||
atlas_gitea_production_enabled: true
|
atlas_gitea_production_enabled: true
|
||||||
|
atlas_gitea_public_domain: git.fscotto.co
|
||||||
atlas_prometheus_pull_start_timer: true
|
atlas_prometheus_pull_start_timer: true
|
||||||
atlas_manage_zfs_snapshots: true
|
atlas_manage_zfs_snapshots: true
|
||||||
atlas_zfs_snapshot_prefix: atlas-auto
|
atlas_zfs_snapshot_prefix: atlas-auto
|
||||||
@@ -140,8 +141,8 @@ atlas_monitor_remote_capacity:
|
|||||||
atlas_manage_sharing: true
|
atlas_manage_sharing: true
|
||||||
atlas_manage_media_stack: false
|
atlas_manage_media_stack: false
|
||||||
# Planned after data-protection validation: move iCloudPD photo ingestion from
|
# Planned after data-protection validation: move iCloudPD photo ingestion from
|
||||||
# Aegis to Atlas, with photos under /zpool/archive/Pictures and persistent
|
# Aegis to Atlas, with photos under /zpool/archive/Pictures/iCloudPD and
|
||||||
# application/MFA state outside Archive. Do not deploy or cut over yet.
|
# application/MFA state in a separate dataset. Do not deploy or cut over yet.
|
||||||
|
|
||||||
# WireGuard is retired on Atlas. These rootless services are a temporary home
|
# WireGuard is retired on Atlas. These rootless services are a temporary home
|
||||||
# until Uranus replaces them.
|
# until Uranus replaces them.
|
||||||
|
|||||||
@@ -6,6 +6,19 @@ ansible_port: 22
|
|||||||
ansible_ssh_private_key_file: /home/fscotto/.ssh/id_ed25519
|
ansible_ssh_private_key_file: /home/fscotto/.ssh/id_ed25519
|
||||||
|
|
||||||
server_username: rocky
|
server_username: rocky
|
||||||
|
server_legacy_stack_retired: true
|
||||||
|
# Destructive deletion runs only with an explicit extra-var and cleanup tag.
|
||||||
|
server_legacy_cleanup: false
|
||||||
|
# Explicit opt-in cleanup; no data, volumes, networks or NPM images are removed.
|
||||||
|
server_legacy_image_cleanup: false
|
||||||
|
server_legacy_images:
|
||||||
|
- docker.gitea.com/gitea:1.25.2
|
||||||
|
- docker.io/deluan/navidrome:latest
|
||||||
|
- docker.io/library/postgres:13
|
||||||
|
server_npm_quadlet_stage: true
|
||||||
|
server_npm_quadlet_image: docker.io/jc21/nginx-proxy-manager@sha256:52b2c59994f3d36acfcf70a1626f29734df0ed8c71bacc0269f78b6f939858bb
|
||||||
|
# The stopped-source export and live Quadlet cutover passed on 2026-10-03.
|
||||||
|
server_npm_quadlet_cutover: true
|
||||||
server_backup_export_enabled: true
|
server_backup_export_enabled: true
|
||||||
server_backup_export_start_timer: true
|
server_backup_export_start_timer: true
|
||||||
# Install the final-copy helper only; it is never run by a normal playbook invocation.
|
# Install the final-copy helper only; it is never run by a normal playbook invocation.
|
||||||
@@ -13,8 +26,8 @@ server_gitea_cutover_tools_enabled: true
|
|||||||
server_gitea_on_atlas: true
|
server_gitea_on_atlas: true
|
||||||
server_gitea_npm_domains:
|
server_gitea_npm_domains:
|
||||||
- git.fscotto.duckdns.org
|
- git.fscotto.duckdns.org
|
||||||
- git.ov-ad3410.infomaniak.ch
|
|
||||||
server_duckdns_domain: fscotto
|
server_duckdns_domain: fscotto
|
||||||
|
server_duckdns_enabled: false
|
||||||
server_ssh_authorized_keys:
|
server_ssh_authorized_keys:
|
||||||
- name: ikaros
|
- name: ikaros
|
||||||
key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINrIxXjA3ffPwziKGR5gzc4gAoBehQPlnEMcXF4Wl0ZS ikaros"
|
key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINrIxXjA3ffPwziKGR5gzc4gAoBehQPlnEMcXF4Wl0ZS ikaros"
|
||||||
|
|||||||
@@ -39,11 +39,41 @@
|
|||||||
state: enabled
|
state: enabled
|
||||||
when: "'workstation_dev_wsl' in group_names"
|
when: "'workstation_dev_wsl' in group_names"
|
||||||
|
|
||||||
|
- name: Install distribution signing keys for Fedora desktop codecs
|
||||||
|
tags: [packages, heic]
|
||||||
|
ansible.builtin.dnf:
|
||||||
|
name: distribution-gpg-keys
|
||||||
|
state: present
|
||||||
|
when: "'graphical_desktop' in group_names"
|
||||||
|
|
||||||
|
- name: Import RPM Fusion Free signing key for Fedora desktop codecs
|
||||||
|
tags: [packages, heic]
|
||||||
|
ansible.builtin.rpm_key:
|
||||||
|
key: /usr/share/distribution-gpg-keys/rpmfusion/RPM-GPG-KEY-rpmfusion-free-fedora-2020
|
||||||
|
fingerprint: E9A491A3DE247814E7E067EAE06F8ECDD651FF2E
|
||||||
|
state: present
|
||||||
|
when: "'graphical_desktop' in group_names"
|
||||||
|
|
||||||
|
- name: Enable RPM Fusion Free for Fedora desktop codecs
|
||||||
|
tags: [packages, heic]
|
||||||
|
ansible.builtin.dnf:
|
||||||
|
name: "https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_facts['distribution_major_version'] }}.noarch.rpm"
|
||||||
|
state: present
|
||||||
|
when: "'graphical_desktop' in group_names"
|
||||||
|
|
||||||
- name: Refresh dnf package metadata
|
- name: Refresh dnf package metadata
|
||||||
tags: [packages]
|
tags: [packages]
|
||||||
ansible.builtin.dnf:
|
ansible.builtin.dnf:
|
||||||
update_cache: true
|
update_cache: true
|
||||||
|
|
||||||
|
- name: Install HEIC decoder on Fedora desktops
|
||||||
|
tags: [packages, heic]
|
||||||
|
ansible.builtin.dnf:
|
||||||
|
name: libheif-freeworld
|
||||||
|
state: present
|
||||||
|
update_cache: true
|
||||||
|
when: "'graphical_desktop' in group_names"
|
||||||
|
|
||||||
- name: Install packages on Fedora
|
- name: Install packages on Fedora
|
||||||
tags: [packages]
|
tags: [packages]
|
||||||
ansible.builtin.dnf:
|
ansible.builtin.dnf:
|
||||||
|
|||||||
@@ -8,10 +8,6 @@ aegis_network_connection_uuid: ""
|
|||||||
aegis_host_dns_servers: []
|
aegis_host_dns_servers: []
|
||||||
aegis_host_dns_search_domains: []
|
aegis_host_dns_search_domains: []
|
||||||
aegis_adguard_image: docker.io/adguard/adguardhome:latest
|
aegis_adguard_image: docker.io/adguard/adguardhome:latest
|
||||||
aegis_icloudpd_image: docker.io/boredazfcuk/icloudpd:latest
|
|
||||||
aegis_icloudpd_folder_structure: '{:%Y/%m/%d}'
|
|
||||||
aegis_icloudpd_synchronisation_interval: 86400
|
|
||||||
aegis_icloudpd_apple_id: ""
|
|
||||||
aegis_ikaros_mac_address: aa:bb:cc:dd:ee:ff
|
aegis_ikaros_mac_address: aa:bb:cc:dd:ee:ff
|
||||||
aegis_wol_port: 9
|
aegis_wol_port: 9
|
||||||
|
|
||||||
|
|||||||
@@ -9,13 +9,12 @@
|
|||||||
name: sshd.service
|
name: sshd.service
|
||||||
state: reloaded
|
state: reloaded
|
||||||
|
|
||||||
- name: Restart Aegis Quadlet services
|
- name: Restart Aegis AdGuard Quadlet
|
||||||
ansible.builtin.systemd:
|
ansible.builtin.systemd:
|
||||||
name: "{{ item }}"
|
name: "{{ item }}"
|
||||||
state: restarted
|
state: restarted
|
||||||
daemon_reload: true
|
daemon_reload: true
|
||||||
loop:
|
loop:
|
||||||
- adguardhome.service
|
- adguardhome.service
|
||||||
- icloudpd.service
|
|
||||||
loop_control:
|
loop_control:
|
||||||
label: "{{ item }}"
|
label: "{{ item }}"
|
||||||
|
|||||||
@@ -13,14 +13,6 @@
|
|||||||
msg: Reboot Aegis to activate the newly layered packages, then rerun the playbook.
|
msg: Reboot Aegis to activate the newly layered packages, then rerun the playbook.
|
||||||
when: aegis_layered_packages_result.needs_reboot | default(false)
|
when: aegis_layered_packages_result.needs_reboot | default(false)
|
||||||
|
|
||||||
- name: Require Aegis iCloudPD Apple ID
|
|
||||||
tags: [aegis, icloudpd]
|
|
||||||
ansible.builtin.assert:
|
|
||||||
that:
|
|
||||||
- aegis_icloudpd_apple_id | length > 0
|
|
||||||
fail_msg: Define vault_aegis_icloudpd_apple_id before applying the Aegis profile.
|
|
||||||
no_log: true
|
|
||||||
|
|
||||||
- name: Require completed Aegis network placeholders
|
- name: Require completed Aegis network placeholders
|
||||||
tags: [aegis, dns, firewall, network, services]
|
tags: [aegis, dns, firewall, network, services]
|
||||||
ansible.builtin.assert:
|
ansible.builtin.assert:
|
||||||
@@ -119,8 +111,6 @@
|
|||||||
loop:
|
loop:
|
||||||
- /var/lib/adguard/work
|
- /var/lib/adguard/work
|
||||||
- /var/lib/adguard/conf
|
- /var/lib/adguard/conf
|
||||||
- /var/lib/icloudpd/data
|
|
||||||
- /var/lib/icloudpd/config
|
|
||||||
|
|
||||||
- name: Create Quadlet configuration directory
|
- name: Create Quadlet configuration directory
|
||||||
tags: [aegis, containers]
|
tags: [aegis, containers]
|
||||||
@@ -142,12 +132,9 @@
|
|||||||
loop:
|
loop:
|
||||||
- src: adguardhome.container.j2
|
- src: adguardhome.container.j2
|
||||||
dest: adguardhome.container
|
dest: adguardhome.container
|
||||||
- src: icloudpd.container.j2
|
|
||||||
dest: icloudpd.container
|
|
||||||
loop_control:
|
loop_control:
|
||||||
label: "{{ item.dest }}"
|
label: "{{ item.dest }}"
|
||||||
no_log: "{{ item.dest == 'icloudpd.container' }}"
|
notify: Restart Aegis AdGuard Quadlet
|
||||||
notify: Restart Aegis Quadlet services
|
|
||||||
|
|
||||||
- name: Create Aegis systemd-resolved configuration directory
|
- name: Create Aegis systemd-resolved configuration directory
|
||||||
tags: [aegis, adguard, dns, services]
|
tags: [aegis, adguard, dns, services]
|
||||||
@@ -168,7 +155,7 @@
|
|||||||
mode: "0644"
|
mode: "0644"
|
||||||
notify:
|
notify:
|
||||||
- Restart Aegis systemd-resolved
|
- Restart Aegis systemd-resolved
|
||||||
- Restart Aegis Quadlet services
|
- Restart Aegis AdGuard Quadlet
|
||||||
|
|
||||||
- name: Point Aegis resolver at the full systemd-resolved configuration
|
- name: Point Aegis resolver at the full systemd-resolved configuration
|
||||||
tags: [aegis, adguard, dns, services]
|
tags: [aegis, adguard, dns, services]
|
||||||
@@ -361,7 +348,7 @@
|
|||||||
group: root
|
group: root
|
||||||
mode: "0755"
|
mode: "0755"
|
||||||
|
|
||||||
- name: Enable Aegis Quadlet services and automatic updates
|
- name: Enable Aegis AdGuard Quadlet and automatic updates
|
||||||
tags: [aegis, containers, services]
|
tags: [aegis, containers, services]
|
||||||
ansible.builtin.systemd:
|
ansible.builtin.systemd:
|
||||||
name: "{{ item }}"
|
name: "{{ item }}"
|
||||||
@@ -370,7 +357,6 @@
|
|||||||
daemon_reload: true
|
daemon_reload: true
|
||||||
loop:
|
loop:
|
||||||
- adguardhome.service
|
- adguardhome.service
|
||||||
- icloudpd.service
|
|
||||||
- podman-auto-update.timer
|
- podman-auto-update.timer
|
||||||
loop_control:
|
loop_control:
|
||||||
label: "{{ item }}"
|
label: "{{ item }}"
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
# Managed by Ansible. Do not edit manually.
|
|
||||||
[Unit]
|
|
||||||
Description=iCloud Photos Downloader
|
|
||||||
Wants=network-online.target
|
|
||||||
After=network-online.target
|
|
||||||
|
|
||||||
[Container]
|
|
||||||
Image={{ aegis_icloudpd_image }}
|
|
||||||
Environment=apple_id={{ aegis_icloudpd_apple_id }}
|
|
||||||
Environment=folder_structure={{ aegis_icloudpd_folder_structure }}
|
|
||||||
Environment=synchronisation_interval={{ aegis_icloudpd_synchronisation_interval }}
|
|
||||||
Volume=/var/lib/icloudpd/data:/home/root/iCloud:Z
|
|
||||||
Volume=/var/lib/icloudpd/config:/config:Z
|
|
||||||
AutoUpdate=registry
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Restart=always
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
||||||
@@ -184,6 +184,7 @@ atlas_gitea_quadlet_dir: "{{ atlas_gitea_home }}/.config/containers/systemd"
|
|||||||
atlas_gitea_image: localhost/atlas-gitea:1.25.2-user-gitea-v1
|
atlas_gitea_image: localhost/atlas-gitea:1.25.2-user-gitea-v1
|
||||||
atlas_gitea_image_build_dir: "{{ atlas_gitea_home }}/.local/share/atlas-gitea-image"
|
atlas_gitea_image_build_dir: "{{ atlas_gitea_home }}/.local/share/atlas-gitea-image"
|
||||||
atlas_gitea_production_enabled: false
|
atlas_gitea_production_enabled: false
|
||||||
|
atlas_gitea_public_domain: ""
|
||||||
atlas_gitea_bind_address: "{{ ansible_host }}"
|
atlas_gitea_bind_address: "{{ ansible_host }}"
|
||||||
atlas_gitea_http_port: 3000
|
atlas_gitea_http_port: 3000
|
||||||
atlas_gitea_ssh_port: 2222
|
atlas_gitea_ssh_port: 2222
|
||||||
@@ -194,6 +195,17 @@ atlas_gitea_restore_test: false
|
|||||||
atlas_gitea_final_restore: false
|
atlas_gitea_final_restore: false
|
||||||
atlas_gitea_restore_helper: /usr/local/libexec/atlas-gitea-restore-test
|
atlas_gitea_restore_helper: /usr/local/libexec/atlas-gitea-restore-test
|
||||||
|
|
||||||
|
# Declare storage and an inactive Quadlet only. The operator supplies the
|
||||||
|
# private configuration, handles MFA, and starts the user service manually.
|
||||||
|
atlas_icloudpd_dataset: "{{ atlas_zfs_pool }}/services/data/icloudpd"
|
||||||
|
atlas_icloudpd_state_dir: "{{ atlas_app_data_mountpoint }}/icloudpd"
|
||||||
|
atlas_icloudpd_config_dir: "{{ atlas_icloudpd_state_dir }}/config"
|
||||||
|
atlas_icloudpd_photos_dir: "{{ atlas_archive_mountpoint }}/Pictures/iCloudPD"
|
||||||
|
atlas_icloudpd_image: >-
|
||||||
|
docker.io/boredazfcuk/icloudpd@sha256:9966c31ddf0b5b306ac2410b4edd5d626806d96e80c92b83cbb689972dc9389f
|
||||||
|
atlas_icloudpd_quadlet_dir: "{{ atlas_admin_home }}/.config/containers/systemd"
|
||||||
|
atlas_icloudpd_timezone: Europe/Rome
|
||||||
|
|
||||||
atlas_45drives_repo_url: https://repo.45drives.com/repofiles/rocky/45drives-enterprise.repo
|
atlas_45drives_repo_url: https://repo.45drives.com/repofiles/rocky/45drives-enterprise.repo
|
||||||
atlas_45drives_repo_file: /etc/yum.repos.d/45drives-enterprise.repo
|
atlas_45drives_repo_file: /etc/yum.repos.d/45drives-enterprise.repo
|
||||||
atlas_45drives_packages:
|
atlas_45drives_packages:
|
||||||
|
|||||||
@@ -1,4 +1,14 @@
|
|||||||
---
|
---
|
||||||
|
- name: Reload Atlas admin user manager
|
||||||
|
become_user: "{{ atlas_admin_username }}"
|
||||||
|
ansible.builtin.systemd:
|
||||||
|
scope: user
|
||||||
|
daemon_reload: true
|
||||||
|
environment:
|
||||||
|
XDG_RUNTIME_DIR: "/run/user/{{ atlas_admin_uid }}"
|
||||||
|
DBUS_SESSION_BUS_ADDRESS: "unix:path=/run/user/{{ atlas_admin_uid }}/bus"
|
||||||
|
when: not ansible_check_mode
|
||||||
|
|
||||||
- name: Reload SSH service
|
- name: Reload SSH service
|
||||||
ansible.builtin.systemd:
|
ansible.builtin.systemd:
|
||||||
name: sshd
|
name: sshd
|
||||||
|
|||||||
58
ansible/roles/profile_atlas/tasks/gitea_public_domain.yml
Normal file
58
ansible/roles/profile_atlas/tasks/gitea_public_domain.yml
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
---
|
||||||
|
- name: Manage the public domain of the restored production Gitea
|
||||||
|
tags: [atlas, gitea, gitea_public_domain]
|
||||||
|
when:
|
||||||
|
- atlas_manage_gitea | bool
|
||||||
|
- atlas_gitea_production_enabled | bool
|
||||||
|
- atlas_gitea_public_domain | length > 0
|
||||||
|
block:
|
||||||
|
- name: Require an explicit public Gitea hostname
|
||||||
|
ansible.builtin.assert:
|
||||||
|
that:
|
||||||
|
- atlas_gitea_public_domain is match('^[a-zA-Z0-9][a-zA-Z0-9.-]*\.[a-zA-Z]{2,}$')
|
||||||
|
|
||||||
|
- name: Inspect the restored private Gitea configuration
|
||||||
|
ansible.builtin.stat:
|
||||||
|
path: "{{ atlas_gitea_mountpoint }}/config/app.ini"
|
||||||
|
follow: false
|
||||||
|
register: atlas_gitea_public_config
|
||||||
|
|
||||||
|
- name: Refuse to create or replace an unprepared Gitea configuration
|
||||||
|
ansible.builtin.assert:
|
||||||
|
that:
|
||||||
|
- atlas_gitea_public_config.stat.isreg | default(false)
|
||||||
|
- atlas_gitea_public_config.stat.uid | int == atlas_gitea_uid | int
|
||||||
|
- atlas_gitea_public_config.stat.mode == '0600'
|
||||||
|
|
||||||
|
# app.ini contains secrets: preserve all unrelated settings and suppress diffs.
|
||||||
|
- name: Set only the declared public Gitea server fields
|
||||||
|
community.general.ini_file:
|
||||||
|
path: "{{ atlas_gitea_mountpoint }}/config/app.ini"
|
||||||
|
section: server
|
||||||
|
option: "{{ item.option }}"
|
||||||
|
value: "{{ item.value }}"
|
||||||
|
create: false
|
||||||
|
backup: true
|
||||||
|
owner: "{{ atlas_gitea_username }}"
|
||||||
|
group: "{{ atlas_gitea_group }}"
|
||||||
|
mode: "0600"
|
||||||
|
loop:
|
||||||
|
- { option: DOMAIN, value: "{{ atlas_gitea_public_domain }}" }
|
||||||
|
- { option: ROOT_URL, value: "https://{{ atlas_gitea_public_domain }}/" }
|
||||||
|
- { option: SSH_DOMAIN, value: "{{ atlas_gitea_public_domain }}" }
|
||||||
|
register: atlas_gitea_public_domain_update
|
||||||
|
no_log: true
|
||||||
|
diff: false
|
||||||
|
|
||||||
|
- name: Restart only Gitea when its public configuration changes
|
||||||
|
become_user: "{{ atlas_gitea_username }}"
|
||||||
|
ansible.builtin.systemd:
|
||||||
|
name: atlas-gitea.service
|
||||||
|
scope: user
|
||||||
|
state: restarted
|
||||||
|
environment:
|
||||||
|
XDG_RUNTIME_DIR: "/run/user/{{ atlas_gitea_uid }}"
|
||||||
|
DBUS_SESSION_BUS_ADDRESS: "unix:path=/run/user/{{ atlas_gitea_uid }}/bus"
|
||||||
|
when:
|
||||||
|
- atlas_gitea_public_domain_update is changed
|
||||||
|
- not ansible_check_mode
|
||||||
188
ansible/roles/profile_atlas/tasks/icloudpd.yml
Normal file
188
ansible/roles/profile_atlas/tasks/icloudpd.yml
Normal file
@@ -0,0 +1,188 @@
|
|||||||
|
---
|
||||||
|
- name: Require exact Atlas iCloudPD paths and rootless identity
|
||||||
|
tags: [atlas, icloudpd]
|
||||||
|
ansible.builtin.assert:
|
||||||
|
that:
|
||||||
|
- atlas_manage_storage | bool
|
||||||
|
- atlas_icloudpd_dataset == atlas_zfs_pool ~ '/services/data/icloudpd'
|
||||||
|
- atlas_icloudpd_state_dir == atlas_app_data_mountpoint ~ '/icloudpd'
|
||||||
|
- atlas_icloudpd_config_dir == atlas_icloudpd_state_dir ~ '/config'
|
||||||
|
- atlas_icloudpd_photos_dir == atlas_archive_mountpoint ~ '/Pictures/iCloudPD'
|
||||||
|
- atlas_admin_uid | int == 1000
|
||||||
|
- atlas_admin_gid | int == 1000
|
||||||
|
- atlas_icloudpd_image is search('@sha256:[0-9a-f]{64}$')
|
||||||
|
fail_msg: Verify the fixed, separate Atlas iCloudPD photo and state paths.
|
||||||
|
|
||||||
|
- name: Declare rootless Atlas iCloudPD storage and boot-started Quadlet
|
||||||
|
tags: [atlas, icloudpd]
|
||||||
|
block:
|
||||||
|
- name: Inspect the existing Archive and application-data datasets
|
||||||
|
community.general.zfs_facts:
|
||||||
|
name: "{{ item.dataset }}"
|
||||||
|
properties: name,mounted,mountpoint
|
||||||
|
loop:
|
||||||
|
- dataset: "{{ atlas_zfs_pool }}/{{ atlas_zfs_dataset_archive }}"
|
||||||
|
mountpoint: "{{ atlas_archive_mountpoint }}"
|
||||||
|
- dataset: "{{ atlas_zfs_pool }}/{{ atlas_zfs_dataset_app_data }}"
|
||||||
|
mountpoint: "{{ atlas_app_data_mountpoint }}"
|
||||||
|
loop_control:
|
||||||
|
label: "{{ item.dataset }}"
|
||||||
|
register: atlas_icloudpd_parent_datasets
|
||||||
|
|
||||||
|
- name: Refuse missing or unmounted iCloudPD parent datasets
|
||||||
|
ansible.builtin.assert:
|
||||||
|
that:
|
||||||
|
- item.ansible_facts.ansible_zfs_datasets | length == 1
|
||||||
|
- item.ansible_facts.ansible_zfs_datasets[0].mounted == 'yes'
|
||||||
|
- item.ansible_facts.ansible_zfs_datasets[0].mountpoint == item.item.mountpoint
|
||||||
|
loop: "{{ atlas_icloudpd_parent_datasets.results }}"
|
||||||
|
loop_control:
|
||||||
|
label: "{{ item.item.dataset }}"
|
||||||
|
|
||||||
|
- name: Inspect the existing Pictures namespace and proposed target
|
||||||
|
ansible.builtin.stat:
|
||||||
|
path: "{{ item }}"
|
||||||
|
follow: false
|
||||||
|
loop:
|
||||||
|
- "{{ atlas_archive_mountpoint }}/Pictures"
|
||||||
|
- "{{ atlas_icloudpd_photos_dir }}"
|
||||||
|
- "{{ atlas_icloudpd_photos_dir }}/.atlas-icloudpd-managed"
|
||||||
|
register: atlas_icloudpd_photo_paths
|
||||||
|
|
||||||
|
- name: Refuse to adopt unrelated Pictures data or a symlink
|
||||||
|
ansible.builtin.assert:
|
||||||
|
that:
|
||||||
|
- atlas_icloudpd_photo_paths.results[0].stat.isdir | default(false)
|
||||||
|
- atlas_icloudpd_photo_paths.results[0].stat.uid | int == atlas_admin_uid | int
|
||||||
|
- >-
|
||||||
|
not atlas_icloudpd_photo_paths.results[1].stat.exists or
|
||||||
|
(atlas_icloudpd_photo_paths.results[1].stat.isdir | default(false) and
|
||||||
|
atlas_icloudpd_photo_paths.results[2].stat.isreg | default(false))
|
||||||
|
fail_msg: >-
|
||||||
|
Pictures must exist and be admin-owned; an existing iCloudPD target
|
||||||
|
must carry its managed marker. Never adopt or replace unrelated data.
|
||||||
|
|
||||||
|
- name: Create a dedicated ZFS dataset for iCloudPD configuration and MFA
|
||||||
|
community.general.zfs:
|
||||||
|
name: "{{ atlas_icloudpd_dataset }}"
|
||||||
|
state: present
|
||||||
|
extra_zfs_properties:
|
||||||
|
compression: zstd
|
||||||
|
mountpoint: "{{ atlas_icloudpd_state_dir }}"
|
||||||
|
|
||||||
|
- name: Restrict iCloudPD state and the new photo subtree
|
||||||
|
ansible.builtin.file:
|
||||||
|
path: "{{ item.path }}"
|
||||||
|
state: directory
|
||||||
|
owner: "{{ atlas_admin_username }}"
|
||||||
|
group: "{{ atlas_admin_group }}"
|
||||||
|
mode: "{{ item.mode }}"
|
||||||
|
loop:
|
||||||
|
- path: "{{ atlas_icloudpd_state_dir }}"
|
||||||
|
mode: "0700"
|
||||||
|
- path: "{{ atlas_icloudpd_config_dir }}"
|
||||||
|
mode: "0700"
|
||||||
|
- path: "{{ atlas_icloudpd_photos_dir }}"
|
||||||
|
mode: "0750"
|
||||||
|
- path: "{{ atlas_icloudpd_quadlet_dir }}"
|
||||||
|
mode: "0700"
|
||||||
|
loop_control:
|
||||||
|
label: "{{ item.path }}"
|
||||||
|
|
||||||
|
- name: Mark only the newly managed iCloudPD photo subtree
|
||||||
|
ansible.builtin.copy:
|
||||||
|
content: "Atlas iCloudPD photo subtree; do not remove source photos.\n"
|
||||||
|
dest: "{{ atlas_icloudpd_photos_dir }}/.atlas-icloudpd-managed"
|
||||||
|
owner: "{{ atlas_admin_username }}"
|
||||||
|
group: "{{ atlas_admin_group }}"
|
||||||
|
mode: "0600"
|
||||||
|
force: false
|
||||||
|
|
||||||
|
- name: Install the image's required mounted-filesystem failsafe
|
||||||
|
ansible.builtin.copy:
|
||||||
|
content: ""
|
||||||
|
dest: "{{ atlas_icloudpd_photos_dir }}/.mounted"
|
||||||
|
owner: "{{ atlas_admin_username }}"
|
||||||
|
group: "{{ atlas_admin_group }}"
|
||||||
|
mode: "0644"
|
||||||
|
force: false
|
||||||
|
|
||||||
|
- name: Require the Vault-backed iCloudPD Apple ID
|
||||||
|
ansible.builtin.assert:
|
||||||
|
that:
|
||||||
|
- vault_atlas_icloudpd_apple_id is defined
|
||||||
|
- vault_atlas_icloudpd_apple_id | length > 0
|
||||||
|
- vault_atlas_icloudpd_apple_id != 'REPLACE_ME'
|
||||||
|
- vault_atlas_icloudpd_apple_id.splitlines() | length == 1
|
||||||
|
fail_msg: Configure the existing iCloudPD Apple ID in Vault.
|
||||||
|
no_log: true
|
||||||
|
|
||||||
|
- name: Seed private Atlas iCloudPD configuration when absent
|
||||||
|
ansible.builtin.template:
|
||||||
|
src: atlas-icloudpd.conf.j2
|
||||||
|
dest: "{{ atlas_icloudpd_config_dir }}/icloudpd.conf"
|
||||||
|
owner: "{{ atlas_admin_username }}"
|
||||||
|
group: "{{ atlas_admin_group }}"
|
||||||
|
mode: "0600"
|
||||||
|
force: false
|
||||||
|
no_log: true
|
||||||
|
diff: false
|
||||||
|
|
||||||
|
- name: Keep declared iCloudPD options in the image-managed configuration
|
||||||
|
ansible.builtin.lineinfile:
|
||||||
|
path: "{{ atlas_icloudpd_config_dir }}/icloudpd.conf"
|
||||||
|
regexp: "^{{ item.key }}="
|
||||||
|
line: "{{ item.key }}={{ item.value }}"
|
||||||
|
owner: "{{ atlas_admin_username }}"
|
||||||
|
group: "{{ atlas_admin_group }}"
|
||||||
|
mode: "0600"
|
||||||
|
loop:
|
||||||
|
- {key: apple_id, value: "{{ vault_atlas_icloudpd_apple_id }}"}
|
||||||
|
- {key: authentication_type, value: MFA}
|
||||||
|
- {key: user, value: user}
|
||||||
|
- {key: user_id, value: "1000"}
|
||||||
|
- {key: group, value: group}
|
||||||
|
- {key: group_id, value: "1000"}
|
||||||
|
- {key: download_path, value: /home/user/iCloud}
|
||||||
|
- {key: folder_structure, value: "{:%Y/%m/%d}"}
|
||||||
|
- {key: directory_permissions, value: "750"}
|
||||||
|
- {key: file_permissions, value: "640"}
|
||||||
|
- {key: download_interval, value: "86400"}
|
||||||
|
- {key: auto_delete, value: "false"}
|
||||||
|
- {key: delete_after_download, value: "false"}
|
||||||
|
loop_control:
|
||||||
|
label: "{{ item.key }}"
|
||||||
|
no_log: true
|
||||||
|
diff: false
|
||||||
|
|
||||||
|
- name: Render the rootless Atlas iCloudPD Quadlet
|
||||||
|
ansible.builtin.template:
|
||||||
|
src: atlas-icloudpd.container.j2
|
||||||
|
dest: "{{ atlas_icloudpd_quadlet_dir }}/atlas-icloudpd.container"
|
||||||
|
owner: "{{ atlas_admin_username }}"
|
||||||
|
group: "{{ atlas_admin_group }}"
|
||||||
|
mode: "0644"
|
||||||
|
register: atlas_icloudpd_quadlet
|
||||||
|
|
||||||
|
- name: Reload the Atlas admin user manager after iCloudPD Quadlet changes
|
||||||
|
become_user: "{{ atlas_admin_username }}"
|
||||||
|
ansible.builtin.systemd:
|
||||||
|
scope: user
|
||||||
|
daemon_reload: true
|
||||||
|
environment:
|
||||||
|
XDG_RUNTIME_DIR: "/run/user/{{ atlas_admin_uid }}"
|
||||||
|
DBUS_SESSION_BUS_ADDRESS: "unix:path=/run/user/{{ atlas_admin_uid }}/bus"
|
||||||
|
when:
|
||||||
|
- atlas_icloudpd_quadlet.changed
|
||||||
|
- not ansible_check_mode
|
||||||
|
|
||||||
|
- name: Keep the rootless Atlas iCloudPD service running
|
||||||
|
become_user: "{{ atlas_admin_username }}"
|
||||||
|
ansible.builtin.systemd:
|
||||||
|
name: atlas-icloudpd.service
|
||||||
|
scope: user
|
||||||
|
state: started
|
||||||
|
environment:
|
||||||
|
XDG_RUNTIME_DIR: "/run/user/{{ atlas_admin_uid }}"
|
||||||
|
DBUS_SESSION_BUS_ADDRESS: "unix:path=/run/user/{{ atlas_admin_uid }}/bus"
|
||||||
|
when: not ansible_check_mode
|
||||||
@@ -20,6 +20,12 @@
|
|||||||
- name: Import staged Atlas rootless Gitea tasks
|
- name: Import staged Atlas rootless Gitea tasks
|
||||||
ansible.builtin.import_tasks: gitea.yml
|
ansible.builtin.import_tasks: gitea.yml
|
||||||
|
|
||||||
|
- name: Import the declared Atlas Gitea public domain
|
||||||
|
ansible.builtin.import_tasks: gitea_public_domain.yml
|
||||||
|
|
||||||
|
- name: Import Atlas iCloudPD storage and boot-started Quadlet tasks
|
||||||
|
ansible.builtin.import_tasks: icloudpd.yml
|
||||||
|
|
||||||
- name: Import explicit Atlas Gitea restore rehearsal tasks
|
- name: Import explicit Atlas Gitea restore rehearsal tasks
|
||||||
ansible.builtin.import_tasks: gitea_restore.yml
|
ansible.builtin.import_tasks: gitea_restore.yml
|
||||||
|
|
||||||
|
|||||||
14
ansible/roles/profile_atlas/templates/atlas-icloudpd.conf.j2
Normal file
14
ansible/roles/profile_atlas/templates/atlas-icloudpd.conf.j2
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
# Managed by Ansible. Password, keyring and MFA cookies are stored separately in /config.
|
||||||
|
apple_id={{ vault_atlas_icloudpd_apple_id }}
|
||||||
|
authentication_type=MFA
|
||||||
|
user=user
|
||||||
|
user_id=1000
|
||||||
|
group=group
|
||||||
|
group_id=1000
|
||||||
|
download_path=/home/user/iCloud
|
||||||
|
folder_structure={:%Y/%m/%d}
|
||||||
|
directory_permissions=750
|
||||||
|
file_permissions=640
|
||||||
|
download_interval=86400
|
||||||
|
auto_delete=false
|
||||||
|
delete_after_download=false
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
# Managed by Ansible. Start automatically with the lingering admin user manager.
|
||||||
|
[Unit]
|
||||||
|
Description=Atlas rootless iCloud Photos Downloader
|
||||||
|
RequiresMountsFor={{ atlas_icloudpd_state_dir }} {{ atlas_icloudpd_photos_dir }}
|
||||||
|
|
||||||
|
[Container]
|
||||||
|
ContainerName=atlas-icloudpd
|
||||||
|
Image={{ atlas_icloudpd_image }}
|
||||||
|
UserNS=keep-id:uid=1000,gid=1000
|
||||||
|
# The image initialises its unprivileged UID 1000 account as container root.
|
||||||
|
User=0
|
||||||
|
# Upstream launcher requires traceroute for its iCloud reachability check.
|
||||||
|
AddCapability=NET_RAW
|
||||||
|
Environment=TZ={{ atlas_icloudpd_timezone }}
|
||||||
|
Volume={{ atlas_icloudpd_photos_dir }}:/home/user/iCloud:z
|
||||||
|
Volume={{ atlas_icloudpd_config_dir }}:/config:Z
|
||||||
|
NoNewPrivileges=true
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Restart=on-failure
|
||||||
|
RestartSec=300
|
||||||
|
TimeoutStartSec=900
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=default.target
|
||||||
@@ -44,13 +44,14 @@
|
|||||||
when: server_backup_export_enabled | bool
|
when: server_backup_export_enabled | bool
|
||||||
|
|
||||||
- name: Install Prometheus backup export helper
|
- name: Install Prometheus backup export helper
|
||||||
tags: [services, backup, prometheus_backup, gitea_cutover]
|
tags: [services, backup, prometheus_backup, gitea_cutover, npm_quadlet_backup]
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
src: prometheus-backup-export.sh.j2
|
src: prometheus-backup-export.sh.j2
|
||||||
dest: /usr/local/sbin/prometheus-backup-export
|
dest: /usr/local/sbin/prometheus-backup-export
|
||||||
owner: root
|
owner: root
|
||||||
group: root
|
group: root
|
||||||
mode: "0750"
|
mode: "0750"
|
||||||
|
validate: "bash -n %s"
|
||||||
when: server_backup_export_enabled | bool
|
when: server_backup_export_enabled | bool
|
||||||
|
|
||||||
- name: Install Prometheus backup export systemd units
|
- name: Install Prometheus backup export systemd units
|
||||||
|
|||||||
@@ -7,7 +7,9 @@
|
|||||||
owner: root
|
owner: root
|
||||||
group: root
|
group: root
|
||||||
mode: "0750"
|
mode: "0750"
|
||||||
when: server_gitea_cutover_tools_enabled | bool
|
when:
|
||||||
|
- server_gitea_cutover_tools_enabled | bool
|
||||||
|
- not server_legacy_stack_retired | bool
|
||||||
|
|
||||||
- name: Require the prepared source and explicit final-export approval
|
- name: Require the prepared source and explicit final-export approval
|
||||||
tags: [services, gitea_final_export]
|
tags: [services, gitea_final_export]
|
||||||
@@ -15,6 +17,7 @@
|
|||||||
that:
|
that:
|
||||||
- server_gitea_cutover_tools_enabled | bool
|
- server_gitea_cutover_tools_enabled | bool
|
||||||
- server_backup_export_enabled | bool
|
- server_backup_export_enabled | bool
|
||||||
|
- not server_legacy_stack_retired | bool
|
||||||
- not ansible_check_mode
|
- not ansible_check_mode
|
||||||
fail_msg: >-
|
fail_msg: >-
|
||||||
Install the cutover helper and perform an explicit non-check-mode run
|
Install the cutover helper and perform an explicit non-check-mode run
|
||||||
@@ -31,4 +34,5 @@
|
|||||||
no_log: true
|
no_log: true
|
||||||
when:
|
when:
|
||||||
- server_gitea_final_export | bool
|
- server_gitea_final_export | bool
|
||||||
|
- not server_legacy_stack_retired | bool
|
||||||
- not ansible_check_mode
|
- not ansible_check_mode
|
||||||
|
|||||||
112
ansible/roles/profile_server/tasks/legacy_cleanup.yml
Normal file
112
ansible/roles/profile_server/tasks/legacy_cleanup.yml
Normal file
@@ -0,0 +1,112 @@
|
|||||||
|
---
|
||||||
|
- name: Require explicit retirement of the migrated Prometheus source
|
||||||
|
ansible.builtin.assert:
|
||||||
|
that:
|
||||||
|
- inventory_hostname == 'prometheus'
|
||||||
|
- server_legacy_stack_retired | bool
|
||||||
|
- server_gitea_on_atlas | bool
|
||||||
|
- server_npm_quadlet_cutover | bool
|
||||||
|
- server_backup_export_enabled | bool
|
||||||
|
|
||||||
|
- name: Verify legacy paths have no mounts or container users
|
||||||
|
ansible.builtin.command:
|
||||||
|
argv:
|
||||||
|
- python3
|
||||||
|
- -c
|
||||||
|
- |
|
||||||
|
import json, os, pathlib, subprocess
|
||||||
|
def run(*args):
|
||||||
|
return subprocess.check_output(args, text=True).strip()
|
||||||
|
paths = ['/opt/gitea', '/home/git/.ssh', '/opt/navidrome',
|
||||||
|
'/opt/postgres', '/opt/music', '/opt/containerd', '/opt/docker']
|
||||||
|
mounts = json.loads(run('findmnt', '--json', '--list', '-o', 'TARGET'))['filesystems']
|
||||||
|
for path in paths:
|
||||||
|
assert os.path.realpath(path) == path, 'Symlink in cleanup path: ' + path
|
||||||
|
for mount in mounts:
|
||||||
|
target = mount['target']
|
||||||
|
assert target != path and not target.startswith(path + '/'), 'Mounted cleanup path: ' + path
|
||||||
|
ids = run('podman', 'ps', '-aq').split()
|
||||||
|
containers = json.loads(run('podman', 'inspect', *ids)) if ids else []
|
||||||
|
for container in containers:
|
||||||
|
assert container['Name'].lstrip('/') == 'nginx-proxy-manager', 'Unexpected container; review before cleanup'
|
||||||
|
for mount in container.get('Mounts', []):
|
||||||
|
source = os.path.realpath(mount['Source'])
|
||||||
|
for path in paths:
|
||||||
|
assert source != path and not source.startswith(path + '/'), 'Container uses cleanup path: ' + path
|
||||||
|
for path in ['/opt/music', '/opt/containerd']:
|
||||||
|
if os.path.isdir(path):
|
||||||
|
for entry in pathlib.Path(path).rglob('*'):
|
||||||
|
assert entry.is_dir() and not entry.is_symlink(), 'Unexpected file in empty legacy path: ' + str(entry)
|
||||||
|
if os.path.isdir('/opt/docker'):
|
||||||
|
allowed = {'/opt/docker/server', '/opt/docker/server/docker-compose.yml'}
|
||||||
|
for entry in pathlib.Path('/opt/docker').rglob('*'):
|
||||||
|
assert str(entry) in allowed and not entry.is_symlink(), 'Unexpected legacy Docker content: ' + str(entry)
|
||||||
|
assert run('systemctl', 'is-active', 'prometheus-npm.service') == 'active'
|
||||||
|
assert subprocess.run(['systemctl', 'is-active', '--quiet', 'podman-compose-server.service']).returncode != 0
|
||||||
|
assert subprocess.run(['systemctl', 'is-active', '--quiet', 'prometheus-backup-export.service']).returncode != 0
|
||||||
|
print('Legacy cleanup preflight passed')
|
||||||
|
changed_when: false
|
||||||
|
check_mode: false
|
||||||
|
|
||||||
|
- name: Require the updated backup configuration before deleting fallback files
|
||||||
|
ansible.builtin.command:
|
||||||
|
argv:
|
||||||
|
- python3
|
||||||
|
- -c
|
||||||
|
- |
|
||||||
|
import pathlib, subprocess
|
||||||
|
unit = subprocess.check_output(['systemctl', 'show', 'prometheus-backup-export.service',
|
||||||
|
'-p', 'RequiresMountsFor', '--value'], text=True)
|
||||||
|
assert '/opt/gitea' not in unit, 'Backup unit still depends on legacy Gitea'
|
||||||
|
helper = pathlib.Path('/usr/local/sbin/prometheus-backup-export').read_text()
|
||||||
|
assert 'podman-compose-server' not in helper and 'opt/docker/server' not in helper
|
||||||
|
subprocess.run(['bash', '-n', '/usr/local/sbin/prometheus-backup-export'], check=True)
|
||||||
|
changed_when: false
|
||||||
|
when: not ansible_check_mode
|
||||||
|
|
||||||
|
- name: Delete only the explicitly approved legacy data and fallback files
|
||||||
|
ansible.builtin.file:
|
||||||
|
path: "{{ item }}"
|
||||||
|
state: absent
|
||||||
|
loop:
|
||||||
|
- /opt/gitea
|
||||||
|
- /home/git/.ssh
|
||||||
|
- /opt/navidrome
|
||||||
|
- /opt/postgres
|
||||||
|
- /opt/music
|
||||||
|
- /opt/containerd
|
||||||
|
- /opt/docker
|
||||||
|
- /usr/local/sbin/prometheus-gitea-final-export
|
||||||
|
- /etc/systemd/system/podman-compose-server.service
|
||||||
|
register: server_legacy_deleted
|
||||||
|
diff: false
|
||||||
|
|
||||||
|
- name: Reload systemd after removing the inactive legacy unit
|
||||||
|
ansible.builtin.systemd:
|
||||||
|
daemon_reload: true
|
||||||
|
when:
|
||||||
|
- server_legacy_deleted is changed
|
||||||
|
- not ansible_check_mode
|
||||||
|
|
||||||
|
- name: Inspect the obsolete Git home without following symlinks
|
||||||
|
ansible.builtin.stat:
|
||||||
|
path: /home/git
|
||||||
|
follow: false
|
||||||
|
register: server_legacy_git_home
|
||||||
|
|
||||||
|
- name: Require the obsolete Git account to be absent before removing its empty home
|
||||||
|
ansible.builtin.command:
|
||||||
|
argv: [getent, passwd, git]
|
||||||
|
register: server_legacy_git_account
|
||||||
|
changed_when: false
|
||||||
|
failed_when: server_legacy_git_account.rc != 2
|
||||||
|
check_mode: false
|
||||||
|
when: server_legacy_git_home.stat.exists
|
||||||
|
|
||||||
|
# rmdir refuses any nonempty directory; never recursively delete this parent.
|
||||||
|
- name: Remove only the empty obsolete Git home
|
||||||
|
ansible.builtin.command:
|
||||||
|
argv: [rmdir, /home/git]
|
||||||
|
register: server_legacy_git_home_removed
|
||||||
|
changed_when: server_legacy_git_home_removed.rc == 0
|
||||||
|
when: server_legacy_git_home.stat.exists
|
||||||
33
ansible/roles/profile_server/tasks/legacy_image_cleanup.yml
Normal file
33
ansible/roles/profile_server/tasks/legacy_image_cleanup.yml
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
---
|
||||||
|
- name: Require the migrated Prometheus topology for image cleanup
|
||||||
|
ansible.builtin.assert:
|
||||||
|
that:
|
||||||
|
- inventory_hostname == 'prometheus'
|
||||||
|
- server_gitea_on_atlas | bool
|
||||||
|
- server_npm_quadlet_cutover | bool
|
||||||
|
- server_legacy_images | default([]) | length > 0
|
||||||
|
- >-
|
||||||
|
server_legacy_images | difference([
|
||||||
|
'docker.gitea.com/gitea:1.25.2',
|
||||||
|
'docker.io/deluan/navidrome:latest',
|
||||||
|
'docker.io/library/postgres:13']) | length == 0
|
||||||
|
|
||||||
|
- name: Check whether the explicitly selected legacy images exist
|
||||||
|
ansible.builtin.command:
|
||||||
|
argv: [podman, image, exists, "{{ item }}"]
|
||||||
|
loop: "{{ server_legacy_images }}"
|
||||||
|
register: server_legacy_image_presence
|
||||||
|
changed_when: false
|
||||||
|
failed_when: server_legacy_image_presence.rc not in [0, 1]
|
||||||
|
check_mode: false
|
||||||
|
|
||||||
|
# No --force: Podman must refuse images referenced by any existing container.
|
||||||
|
- name: Remove only unused explicitly selected legacy images
|
||||||
|
ansible.builtin.command:
|
||||||
|
argv: [podman, image, rm, "{{ item.item }}"]
|
||||||
|
loop: "{{ server_legacy_image_presence.results }}"
|
||||||
|
loop_control:
|
||||||
|
label: "{{ item.item }}"
|
||||||
|
when: item.rc == 0
|
||||||
|
register: server_legacy_image_removal
|
||||||
|
changed_when: server_legacy_image_removal.rc == 0
|
||||||
@@ -11,6 +11,7 @@
|
|||||||
- name: Configure DuckDNS updater
|
- name: Configure DuckDNS updater
|
||||||
tags: [dotfiles, dotfiles:server, duckdns]
|
tags: [dotfiles, dotfiles:server, duckdns]
|
||||||
ansible.builtin.import_tasks: duckdns.yml
|
ansible.builtin.import_tasks: duckdns.yml
|
||||||
|
when: server_duckdns_enabled | bool
|
||||||
|
|
||||||
- name: Ensure server directories exist
|
- name: Ensure server directories exist
|
||||||
tags: [dotfiles, services]
|
tags: [dotfiles, services]
|
||||||
@@ -23,6 +24,9 @@
|
|||||||
loop: "{{ server_directories | default([]) }}"
|
loop: "{{ server_directories | default([]) }}"
|
||||||
loop_control:
|
loop_control:
|
||||||
label: "{{ item.path }}"
|
label: "{{ item.path }}"
|
||||||
|
when:
|
||||||
|
- item.path != '/opt/gitea/data' or not server_gitea_on_atlas | bool
|
||||||
|
- item.path != server_container_stack_dir or not server_legacy_stack_retired | bool
|
||||||
|
|
||||||
- name: Copy server dotfiles
|
- name: Copy server dotfiles
|
||||||
tags: [dotfiles, dotfiles:server]
|
tags: [dotfiles, dotfiles:server]
|
||||||
@@ -48,16 +52,32 @@
|
|||||||
loop_control:
|
loop_control:
|
||||||
label: "{{ item.dest }}"
|
label: "{{ item.dest }}"
|
||||||
no_log: "{{ item.no_log | default(false) }}"
|
no_log: "{{ item.no_log | default(false) }}"
|
||||||
|
when: item.src != 'server/docker-compose.yml.j2' or not server_legacy_stack_retired | bool
|
||||||
|
|
||||||
- name: Manage Podman Compose stack
|
- name: Manage Podman Compose stack
|
||||||
tags: [services, podman]
|
tags: [services, podman]
|
||||||
ansible.builtin.include_tasks: podman-compose.yml
|
ansible.builtin.include_tasks: podman-compose.yml
|
||||||
|
when: not server_legacy_stack_retired | bool
|
||||||
|
|
||||||
|
- name: Import staged NPM Quadlet tasks
|
||||||
|
ansible.builtin.import_tasks: npm_quadlet.yml
|
||||||
|
|
||||||
|
- name: Import explicit legacy server image cleanup
|
||||||
|
ansible.builtin.import_tasks: legacy_image_cleanup.yml
|
||||||
|
tags: [never, server_image_cleanup]
|
||||||
|
when: server_legacy_image_cleanup | default(false) | bool
|
||||||
|
|
||||||
- name: Import Prometheus backup export identity tasks
|
- name: Import Prometheus backup export identity tasks
|
||||||
ansible.builtin.import_tasks: backup_export_identity.yml
|
ansible.builtin.import_tasks: backup_export_identity.yml
|
||||||
|
|
||||||
- name: Import Prometheus backup export job tasks
|
- name: Import Prometheus backup export job tasks
|
||||||
ansible.builtin.import_tasks: backup_export_job.yml
|
ansible.builtin.import_tasks: backup_export_job.yml
|
||||||
|
tags: [server_legacy_cleanup]
|
||||||
|
|
||||||
|
- name: Import explicitly approved legacy server data cleanup
|
||||||
|
ansible.builtin.import_tasks: legacy_cleanup.yml
|
||||||
|
tags: [never, server_legacy_cleanup]
|
||||||
|
when: server_legacy_cleanup | bool
|
||||||
|
|
||||||
- name: Import explicit Prometheus Gitea final-export tasks
|
- name: Import explicit Prometheus Gitea final-export tasks
|
||||||
ansible.builtin.import_tasks: gitea_final_export.yml
|
ansible.builtin.import_tasks: gitea_final_export.yml
|
||||||
|
|||||||
71
ansible/roles/profile_server/tasks/npm_quadlet.yml
Normal file
71
ansible/roles/profile_server/tasks/npm_quadlet.yml
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
---
|
||||||
|
- name: Require staged NPM Quadlet for an active cutover
|
||||||
|
tags: [services, npm_quadlet]
|
||||||
|
ansible.builtin.assert:
|
||||||
|
that:
|
||||||
|
- not server_npm_quadlet_cutover | bool or server_npm_quadlet_stage | bool
|
||||||
|
fail_msg: The NPM Quadlet cutover requires the staged container and network.
|
||||||
|
|
||||||
|
- name: Validate staged NPM Quadlet inputs
|
||||||
|
tags: [services, npm_quadlet]
|
||||||
|
ansible.builtin.assert:
|
||||||
|
that:
|
||||||
|
- server_npm_quadlet_image is defined
|
||||||
|
- server_npm_quadlet_image is match('^docker\.io/jc21/nginx-proxy-manager@sha256:[a-f0-9]{64}$')
|
||||||
|
- server_gitea_on_atlas | bool
|
||||||
|
fail_msg: Stage the exact running NPM image only after Gitea has left Compose.
|
||||||
|
when: server_npm_quadlet_stage | bool
|
||||||
|
|
||||||
|
- name: Ensure rootful Quadlet directory exists for NPM
|
||||||
|
tags: [services, npm_quadlet]
|
||||||
|
ansible.builtin.file:
|
||||||
|
path: /etc/containers/systemd
|
||||||
|
state: directory
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: "0755"
|
||||||
|
when: server_npm_quadlet_stage | bool
|
||||||
|
|
||||||
|
- name: Render staged NPM container and network Quadlets
|
||||||
|
tags: [services, npm_quadlet]
|
||||||
|
ansible.builtin.template:
|
||||||
|
src: "{{ item }}.j2"
|
||||||
|
dest: "/etc/containers/systemd/{{ item }}"
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: "0644"
|
||||||
|
loop:
|
||||||
|
- prometheus-npm.container
|
||||||
|
- server-web.network
|
||||||
|
loop_control:
|
||||||
|
label: "{{ item }}"
|
||||||
|
register: server_npm_quadlet_units
|
||||||
|
when: server_npm_quadlet_stage | bool
|
||||||
|
|
||||||
|
- name: Reload systemd after staging NPM Quadlets
|
||||||
|
tags: [services, npm_quadlet]
|
||||||
|
ansible.builtin.systemd:
|
||||||
|
daemon_reload: true
|
||||||
|
when:
|
||||||
|
- server_npm_quadlet_stage | bool
|
||||||
|
- server_npm_quadlet_units is changed
|
||||||
|
- not ansible_check_mode
|
||||||
|
|
||||||
|
- name: Verify the staged NPM Quadlet was generated
|
||||||
|
tags: [services, npm_quadlet]
|
||||||
|
ansible.builtin.command:
|
||||||
|
argv: [systemctl, show, prometheus-npm.service, --property=LoadState, --value]
|
||||||
|
register: server_npm_quadlet_load_state
|
||||||
|
changed_when: false
|
||||||
|
when:
|
||||||
|
- server_npm_quadlet_stage | bool
|
||||||
|
- not ansible_check_mode
|
||||||
|
|
||||||
|
- name: Reject an invalid staged NPM Quadlet
|
||||||
|
tags: [services, npm_quadlet]
|
||||||
|
ansible.builtin.assert:
|
||||||
|
that: server_npm_quadlet_load_state.stdout == 'loaded'
|
||||||
|
fail_msg: Quadlet generator did not produce prometheus-npm.service.
|
||||||
|
when:
|
||||||
|
- server_npm_quadlet_stage | bool
|
||||||
|
- not ansible_check_mode
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=Prepare a read-only Prometheus application backup for Atlas
|
Description=Prepare a read-only Prometheus application backup for Atlas
|
||||||
RequiresMountsFor=/opt/npm /opt/gitea {{ server_backup_export_root }}
|
RequiresMountsFor=/opt/npm {% if not server_gitea_on_atlas | bool %}/opt/gitea {% endif %}{{ server_backup_export_root }}
|
||||||
ConditionFileIsExecutable=/usr/local/sbin/prometheus-backup-export
|
ConditionFileIsExecutable=/usr/local/sbin/prometheus-backup-export
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
|
|||||||
@@ -4,7 +4,24 @@ umask 077
|
|||||||
|
|
||||||
export_root={{ server_backup_export_root | quote }}
|
export_root={{ server_backup_export_root | quote }}
|
||||||
versions="$export_root/versions"
|
versions="$export_root/versions"
|
||||||
stack_unit=podman-compose-server.service
|
{% if server_legacy_stack_retired | bool %}
|
||||||
|
stack_unit=prometheus-npm.service
|
||||||
|
{% else %}
|
||||||
|
stack_unit=''
|
||||||
|
compose_active=false
|
||||||
|
quadlet_active=false
|
||||||
|
systemctl is-active --quiet podman-compose-server.service && compose_active=true
|
||||||
|
systemctl is-active --quiet prometheus-npm.service && quadlet_active=true
|
||||||
|
if [[ "$compose_active" == "$quadlet_active" ]]; then
|
||||||
|
echo 'Expected exactly one active NPM service (Compose or Quadlet)' >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if "$quadlet_active"; then
|
||||||
|
stack_unit=prometheus-npm.service
|
||||||
|
else
|
||||||
|
stack_unit=podman-compose-server.service
|
||||||
|
fi
|
||||||
|
{% endif %}
|
||||||
stamp=$(date -u +%Y%m%dT%H%M%SZ)
|
stamp=$(date -u +%Y%m%dT%H%M%SZ)
|
||||||
stage=''
|
stage=''
|
||||||
stack_stopped=false
|
stack_stopped=false
|
||||||
@@ -33,7 +50,7 @@ trap 'exit 130' INT
|
|||||||
trap 'exit 143' TERM
|
trap 'exit 143' TERM
|
||||||
|
|
||||||
systemctl is-active --quiet "$stack_unit" || {
|
systemctl is-active --quiet "$stack_unit" || {
|
||||||
echo 'The managed Compose stack must be active before preparing a backup' >&2
|
echo "The managed NPM unit $stack_unit must be active before preparing a backup" >&2
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -70,6 +87,15 @@ for container in nginx-proxy-manager{% if not server_gitea_on_atlas | bool %} gi
|
|||||||
done
|
done
|
||||||
"$running" || { echo "Container did not restart: $container" >&2; exit 1; }
|
"$running" || { echo "Container did not restart: $container" >&2; exit 1; }
|
||||||
done
|
done
|
||||||
|
ready=false
|
||||||
|
for _ in {1..60}; do
|
||||||
|
if curl -fsS --connect-timeout 2 --max-time 3 -o /dev/null http://127.0.0.1:81/; then
|
||||||
|
ready=true
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
|
"$ready" || { echo 'NPM administration did not become ready after backup' >&2; exit 1; }
|
||||||
stack_stopped=false
|
stack_stopped=false
|
||||||
|
|
||||||
tar -tf "$stage/payload.tar" >/dev/null
|
tar -tf "$stage/payload.tar" >/dev/null
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Nginx Proxy Manager on Prometheus
|
||||||
|
RequiresMountsFor=/opt/npm/data /opt/npm/letsencrypt
|
||||||
|
|
||||||
|
[Container]
|
||||||
|
Image={{ server_npm_quadlet_image }}
|
||||||
|
ContainerName=nginx-proxy-manager
|
||||||
|
Network=server-web.network
|
||||||
|
NetworkAlias=nginx-proxy-manager
|
||||||
|
AddHost=host.containers.internal:host-gateway
|
||||||
|
PublishPort=80:80
|
||||||
|
PublishPort=443:443
|
||||||
|
PublishPort=127.0.0.1:81:81
|
||||||
|
Volume=/opt/npm/data:/data
|
||||||
|
Volume=/opt/npm/letsencrypt:/etc/letsencrypt
|
||||||
|
Pull=missing
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Restart=always
|
||||||
|
TimeoutStartSec=180
|
||||||
|
TimeoutStopSec=120
|
||||||
|
|
||||||
|
{% if server_npm_quadlet_cutover | bool %}
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
{% endif %}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
[Network]
|
||||||
|
NetworkName=server_web
|
||||||
|
Driver=bridge
|
||||||
|
Subnet=10.89.0.0/24
|
||||||
|
Gateway=10.89.0.1
|
||||||
@@ -4,7 +4,7 @@ name: server
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
nginx-proxy-manager:
|
nginx-proxy-manager:
|
||||||
image: docker.io/jc21/nginx-proxy-manager:latest
|
image: {{ server_npm_quadlet_image if server_npm_quadlet_stage | bool else 'docker.io/jc21/nginx-proxy-manager:latest' }}
|
||||||
container_name: nginx-proxy-manager
|
container_name: nginx-proxy-manager
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
@@ -1,8 +1,18 @@
|
|||||||
# Gitea migration from Prometheus to Atlas
|
# Gitea migration from Prometheus to Atlas
|
||||||
|
|
||||||
|
The later 2026-10-03 canonical-domain change to `git.fscotto.co` is recorded
|
||||||
|
in `docs/domain-fscotto-co.md`. Public SSH remains on TCP/2222; the old
|
||||||
|
DuckDNS Proxy Host was observed disabled. Earlier domain references below
|
||||||
|
describe migration evidence, not the current canonical URL.
|
||||||
|
|
||||||
This records the staged migration and its observed partial cutover. Gitea is
|
This records the staged migration and its observed partial cutover. Gitea is
|
||||||
temporary on Atlas until Uranus; NPM remains on Prometheus. Preserve the old
|
temporary on Atlas until Uranus; NPM remains on Prometheus. On 2026-10-03
|
||||||
Prometheus data, but do not restart its stale Gitea after Atlas accepts writes.
|
the operator explicitly approved removal of the old Prometheus Gitea data,
|
||||||
|
SSH fragment and final-export helper. NPM now uses a rootful Quadlet with no
|
||||||
|
installed Compose fallback. The source-retention and rollback steps below
|
||||||
|
are historical migration gates, not current recovery instructions.
|
||||||
|
Existing backup archives were preserved; use current Atlas data and verified
|
||||||
|
backups for recovery. Do not recreate or restart stale source Gitea.
|
||||||
|
|
||||||
## Observed source before cutover and chosen topology (2026-10-01)
|
## Observed source before cutover and chosen topology (2026-10-01)
|
||||||
|
|
||||||
@@ -139,6 +149,10 @@ or credentials were changed. The
|
|||||||
secondary hostname `git.ov-ad3410.infomaniak.ch` did not resolve from Ikaros
|
secondary hostname `git.ov-ad3410.infomaniak.ch` did not resolve from Ikaros
|
||||||
and had no generated NPM config file at the time of inspection.
|
and had no generated NPM config file at the time of inspection.
|
||||||
|
|
||||||
|
On 2026-10-03 the operator retired this unused secondary hostname. Its NPM
|
||||||
|
Proxy Host was already soft-deleted; Ansible now declares only
|
||||||
|
`git.fscotto.duckdns.org` and removes the secondary runtime override.
|
||||||
|
|
||||||
Prometheus' public TCP/2222 socket proxies to Atlas without changing admin
|
Prometheus' public TCP/2222 socket proxies to Atlas without changing admin
|
||||||
SSH/22. The local socket presents the preserved Gitea ED25519 host key, but
|
SSH/22. The local socket presents the preserved Gitea ED25519 host key, but
|
||||||
an external TCP/2222 connection from Ikaros initially timed out. During that
|
an external TCP/2222 connection from Ikaros initially timed out. During that
|
||||||
|
|||||||
173
docs/atlas-icloudpd-migration.md
Normal file
173
docs/atlas-icloudpd-migration.md
Normal file
@@ -0,0 +1,173 @@
|
|||||||
|
# iCloudPD: Aegis to Atlas
|
||||||
|
|
||||||
|
Atlas is the temporary ingestion host until Uranus. Aegis iCloudPD and its
|
||||||
|
state were retired. Ansible declares Atlas storage, the rootless Quadlet,
|
||||||
|
and a private `icloudpd.conf` with the Apple ID from the existing Vault key.
|
||||||
|
The password, keyring and MFA cookies remain application-managed; initialization
|
||||||
|
is interactive.
|
||||||
|
Do not place cookies, keyring files, passwords, or the Apple ID in this document,
|
||||||
|
unencrypted repository content, or a terminal transcript.
|
||||||
|
|
||||||
|
## Historical source and current destination (2026-10-02)
|
||||||
|
|
||||||
|
- Before retirement, Aegis' rootful `icloudpd.service` was active (no reported restarts, running
|
||||||
|
since 2026-07-25), but its declared data bind `/var/lib/icloudpd/data`
|
||||||
|
has **zero top-level entries** and is 4 KiB as observed on 2026-10-02.
|
||||||
|
Its persistent config has two top-level entries. `pi` cannot run passwordless
|
||||||
|
sudo, so the container's internal filesystem and root-only state have **not**
|
||||||
|
been audited. Do not conclude there are no photos to preserve: they could be
|
||||||
|
inside the container overlay because the declared bind targets the wrong
|
||||||
|
home. The current
|
||||||
|
Quadlet mounts that data directory at `/home/root/iCloud`; the image's
|
||||||
|
documented default is `/home/user/iCloud` with its default `user=user`.
|
||||||
|
- The non-secret `folder_structure` value in the persisted Aegis config is a
|
||||||
|
systemd generator path, **not** `{:%Y/%m/%d}`. The Quadlet passes percent
|
||||||
|
characters in `Environment=` without systemd escaping; that is the likely
|
||||||
|
cause. A running unit therefore does not prove that Aegis ingests photos.
|
||||||
|
Do not copy this config or assume that its MFA state is usable on Atlas.
|
||||||
|
- Atlas' `zpool` is healthy. `/zpool/archive/Pictures` already contains about
|
||||||
|
25 GiB of unrelated data; iCloudPD gets only a new managed
|
||||||
|
`/zpool/archive/Pictures/iCloudPD` subtree. Both that subtree and
|
||||||
|
`zpool/services/data/icloudpd` were created on 2026-10-02. Never rsync with `--delete` into
|
||||||
|
Pictures or adopt its existing contents. `/zpool/media/photobook` is reserved
|
||||||
|
for Immich and remains untouched, including its Aegis-only NFS export.
|
||||||
|
|
||||||
|
The upstream image documents `/config/icloudpd.conf` as its primary
|
||||||
|
configuration (environment configuration is deprecated), an exact
|
||||||
|
`/home/${user}/iCloud/.mounted` failsafe, and an interactive `--Initialise`
|
||||||
|
step for keyring and MFA cookies. The configuration must use the same download
|
||||||
|
path, user/UID, and folder format as the bind mounts. References:
|
||||||
|
[image configuration](https://github.com/boredazfcuk/docker-icloudpd/blob/master/CONFIGURATION.md),
|
||||||
|
[Podman user namespaces](https://docs.podman.io/en/latest/markdown/podman-pod.unit.5.html).
|
||||||
|
|
||||||
|
## Declared Atlas target
|
||||||
|
|
||||||
|
| Item | Location or policy |
|
||||||
|
| --- | --- |
|
||||||
|
| Downloaded photos | `/zpool/archive/Pictures/iCloudPD`, a new managed subtree of the SMB `Archive` dataset |
|
||||||
|
| Config, keyring, MFA cookies | `zpool/services/data/icloudpd` at `/zpool/services/data/icloudpd/config`, outside Archive |
|
||||||
|
| Host service owner | `admin` rootless user manager; no rootful Quadlet or published port |
|
||||||
|
| Container identity | Entry process root in its user namespace; downloader UID/GID 1000 maps to host `admin` |
|
||||||
|
| Image | Digest-pinned `docker.io/boredazfcuk/icloudpd`, with no registry auto-update |
|
||||||
|
| SELinux | Private `:Z` config bind; shared `:z` photo bind because Archive is also exposed through SMB and used by Syncthing. The label and SMB behavior require runtime testing. |
|
||||||
|
| Access | The new subtree is `admin:admin` mode 0750. No Photobook ownership, ACL, or export changes. |
|
||||||
|
| Sync policy | Daily interval; explicit directory/file modes 750/640; no iCloud deletion and no deletion of destination-only files |
|
||||||
|
|
||||||
|
The photo subtree receives a managed marker and the image's `.mounted` file.
|
||||||
|
An existing unmarked path is refused rather than taken over. The existing
|
||||||
|
Pictures tree is not chowned or emptied. The Quadlet now has `[Install]` with
|
||||||
|
`WantedBy=default.target`, so the lingering admin user manager starts it at boot.
|
||||||
|
Ansible keeps the service running. Ansible renders a mode-0600
|
||||||
|
`icloudpd.conf` with `no_log` and no diff, but does not pull the image,
|
||||||
|
initialize MFA, or run a cutover task. Boot startup was approved on 2026-10-03
|
||||||
|
after a reboot left the previously manual-started service inactive.
|
||||||
|
|
||||||
|
The previous gated check-mode tests and isolated Quadlet-generator test proved
|
||||||
|
only the proposed layout; they predate the simplified declarative role. They
|
||||||
|
were not a production deployment or an authentication test.
|
||||||
|
|
||||||
|
## Evidence already gathered without production writes
|
||||||
|
|
||||||
|
The digest-pinned image was pulled into **admin's** Atlas Podman store. An
|
||||||
|
isolated `/var/tmp` test ran with no network, a fake Apple ID, private temporary
|
||||||
|
config/photo mounts, `keep-id:uid=1000,gid=1000`, and no new privileges. Both
|
||||||
|
container root and UID 1000 wrote to the mounts; UID
|
||||||
|
1000's files mapped to host `admin`. A short-lived container remained running,
|
||||||
|
retained the intended `/home/user/iCloud` and literal `{:%Y/%m/%d}` config,
|
||||||
|
and saw an admin-owned `.mounted` marker. The container and temporary files
|
||||||
|
were removed. A second isolated test showed that dropping **all** container
|
||||||
|
capabilities prevents its root entrypoint from reading an admin-owned 0600
|
||||||
|
config; with the default rootless user-namespace capabilities it could read
|
||||||
|
and write that file. The Quadlet retains `NoNewPrivileges=true` but does not
|
||||||
|
drop every capability. This proves only the container layout and namespace mapping,
|
||||||
|
**not** Apple authentication, a real download, SMB visibility, scheduled
|
||||||
|
operation, backup coverage, or recovery.
|
||||||
|
|
||||||
|
The earlier disposable Photobook ACL test is superseded by the operator's
|
||||||
|
clarification that Photobook belongs to Immich. It is not evidence for the
|
||||||
|
current Archive destination, and the proposed Photobook ACL change was never
|
||||||
|
deployed.
|
||||||
|
|
||||||
|
Backup path review on 2026-10-02: the managed Borg and USB scripts snapshot
|
||||||
|
the pool recursively and bind every mounted child dataset, so both
|
||||||
|
`archive` and the proposed `services/data/icloudpd` fall within their
|
||||||
|
declared source scope. Borg's runner switches to the dedicated `borg` account
|
||||||
|
with only `CAP_DAC_READ_SEARCH`; a read-only check using those exact `setpriv`
|
||||||
|
capability flags could traverse/read Archive, whereas plain
|
||||||
|
`sudo -u borg` could not. USB copies as root and preserves POSIX ACLs, but not
|
||||||
|
generic xattrs/SELinux labels. **This was scope and permission evidence, not a
|
||||||
|
completed backup or restore of iCloudPD data**, which did not exist at the time.
|
||||||
|
|
||||||
|
## Validation status and remaining checks
|
||||||
|
|
||||||
|
- Aegis retirement is complete: `icloudpd.service` is `not-found`/`inactive`,
|
||||||
|
the rootful Quadlet and `/var/lib/icloudpd` are absent, and AdGuard is active.
|
||||||
|
The temporary retirement tasks are no longer in the Aegis role. The Podman
|
||||||
|
image cache may remain; it is not service data.
|
||||||
|
- Atlas storage and the `admin` Quadlet are deployed. The second Ansible
|
||||||
|
run changed nothing and did not start the service; a later manual start
|
||||||
|
generated the config. `/zpool/media/photobook` was unchanged.
|
||||||
|
- The image generated `/zpool/services/data/icloudpd/config/icloudpd.conf`
|
||||||
|
on first start. Ansible replaced that default file with a private template
|
||||||
|
using the Apple ID already in Vault. The operator initialized password
|
||||||
|
and MFA interactively; never put credentials or codes in the repository,
|
||||||
|
chat, or Ansible extra-vars. Automatic boot startup was separately approved
|
||||||
|
on 2026-10-03; this does not change the interactive MFA procedure.
|
||||||
|
- Initial ingestion completed on 2026-10-03. Still check folder structure,
|
||||||
|
ownership, SELinux and SMB access, no unintended deletions, the next daily
|
||||||
|
cycle, completed Borg and USB versions, and isolated restore of photos and
|
||||||
|
private state. A recursive hourly `zpool/archive` snapshot exists after
|
||||||
|
ingestion, but no iCloudPD-specific backup restore has passed. The first
|
||||||
|
real scrub and measured recovery targets are separate open items.
|
||||||
|
|
||||||
|
On 2026-10-02 Atlas storage and the inactive Quadlet were deployed; a second
|
||||||
|
Ansible run made zero changes. The generated service was inactive, and no
|
||||||
|
`icloudpd.conf` existed. Two interactive-sudo Aegis runs removed its service,
|
||||||
|
Quadlet and `/var/lib/icloudpd`, then cleared the failed-unit record left by a
|
||||||
|
SIGKILL during shutdown. Read-only verification found `LoadState=not-found`,
|
||||||
|
`ActiveState=inactive`, both paths absent, and AdGuard active.
|
||||||
|
|
||||||
|
On 2026-10-02 the operator requested the first manual start. The rootless
|
||||||
|
service stayed active, and the image generated `icloudpd.conf` under the
|
||||||
|
private config dataset. Its mode was tightened from 0644 to 0600. The generated
|
||||||
|
`apple_id` field is empty; no MFA or download is verified. The service has no
|
||||||
|
boot-time install target, so it is not configured for automatic startup.
|
||||||
|
|
||||||
|
The 2026-10-02 Atlas `icloudpd` run rendered the Vault-backed template without
|
||||||
|
printing its contents; the second run made zero changes. File owner is
|
||||||
|
`admin:admin`, mode 0600, and the Apple ID field is nonempty. The rootless
|
||||||
|
service remained active with zero restarts. At that point keyring initialization,
|
||||||
|
cookie creation and a real download were unverified. The template now reads
|
||||||
|
`vault_atlas_icloudpd_apple_id`, which is already present in the encrypted
|
||||||
|
Vault; no password or MFA code was added to the template.
|
||||||
|
|
||||||
|
The attempted interactive initialization then lost its container. Diagnosis
|
||||||
|
found that the image launcher requires `traceroute` to pass its iCloud
|
||||||
|
reachability check. Rootless Podman without `NET_RAW` returned `Operation not
|
||||||
|
permitted` despite working Atlas/container DNS and host HTTPS. An isolated
|
||||||
|
container with only `CAP_NET_RAW` passed the same check. The Quadlet now grants
|
||||||
|
that single capability while keeping `NoNewPrivileges=true`; a manual restart
|
||||||
|
passed `traceroute`, and the app stayed running. Logs then showed only the missing
|
||||||
|
keyring and a wait for `--Initialise` again. The app expanded the generated config
|
||||||
|
on startup, so Ansible now seeds it only when absent and idempotently maintains
|
||||||
|
only its declared options. A second live Ansible run made zero changes. At
|
||||||
|
that point MFA, actual ingestion, and backup/restore were unverified.
|
||||||
|
|
||||||
|
On 2026-10-03, after interactive initialization, the rootless service was
|
||||||
|
active and the previous 24h of logs showed download activity with no
|
||||||
|
authentication failures or errors. At 02:16 the application reported `All
|
||||||
|
photos and videos have been downloaded` and `Download complete for user`.
|
||||||
|
The destination contained 11,658 files totaling 86,020,430,015 bytes; this
|
||||||
|
is a filesystem file count, not a count of distinct iCloud assets. A later
|
||||||
|
read-only check found the service still active. This closes initial
|
||||||
|
authentication and ingestion only: a subsequent daily cycle and end-to-end
|
||||||
|
recovery of the new photos and private state remain untested.
|
||||||
|
|
||||||
|
On 2026-10-03 Atlas rebooted at 10:17 CEST; iCloudPD stayed inactive because
|
||||||
|
its Quadlet had no install target. A manual start restored the running service
|
||||||
|
and the application began listing iCloud files. The operator then approved
|
||||||
|
persistent boot startup. The managed Quadlet now declares
|
||||||
|
`WantedBy=default.target`; the live generator created
|
||||||
|
`default.target.wants/atlas-icloudpd.service`, admin has `Linger=yes`, and the
|
||||||
|
service remained active with zero restarts. No NAS reboot was performed to
|
||||||
|
test this change; actual post-reboot startup remains untested.
|
||||||
82
docs/domain-fscotto-co.md
Normal file
82
docs/domain-fscotto-co.md
Normal file
@@ -0,0 +1,82 @@
|
|||||||
|
# fscotto.co domain transition
|
||||||
|
|
||||||
|
## Observed state (2026-10-03)
|
||||||
|
|
||||||
|
Namecheap remains the DNS provider. The operator moved GitHub Pages to
|
||||||
|
`blog.fscotto.co` in `fscotto/fscotto.github.io`, aligned Hugo and Pages
|
||||||
|
settings, and changed the apex A record to `179.237.102.172`. The blog
|
||||||
|
remains a CNAME to `fscotto.github.io`; mail records were left unchanged.
|
||||||
|
A new Hugo deployment and cache clearing resolved the initial stale DNS
|
||||||
|
and generated URLs. Blog HTTPS returned 200 with valid TLS.
|
||||||
|
|
||||||
|
The `git`, `music` and `syncthing` subdomains are CNAMEs to `fscotto.co`.
|
||||||
|
The operator added NPM Proxy Hosts with certificates, WebSocket support
|
||||||
|
and Force SSL:
|
||||||
|
|
||||||
|
| Hostname | HTTP upstream |
|
||||||
|
| --- | --- |
|
||||||
|
| git.fscotto.co | 192.168.178.55:3000 |
|
||||||
|
| music.fscotto.co | 192.168.178.55:4533 |
|
||||||
|
| syncthing.fscotto.co | 192.168.178.55:8384 |
|
||||||
|
|
||||||
|
All three redirected HTTP to HTTPS and returned final HTTPS 200 with valid
|
||||||
|
TLS. Only the Syncthing GUI uses NPM; native synchronization is unchanged.
|
||||||
|
NPM administration remains loopback-only on port 81 via SSH tunnel.
|
||||||
|
|
||||||
|
## Gitea canonical hostname
|
||||||
|
|
||||||
|
Atlas declares `atlas_gitea_public_domain: git.fscotto.co`. Ansible manages
|
||||||
|
only `[server] DOMAIN`, `ROOT_URL` and `SSH_DOMAIN` in the existing private
|
||||||
|
app.ini, preserving unrelated settings and mode 0600. Private configuration
|
||||||
|
backups are created; diffs and secret-bearing results are suppressed.
|
||||||
|
Only Gitea restarts when these fields change; a repeat run changed nothing.
|
||||||
|
|
||||||
|
HTTPS uses `https://git.fscotto.co/`; public SSH remains TCP/2222.
|
||||||
|
Agent read-only checks returned the same HEAD from `fscotto/infra.git`
|
||||||
|
over HTTPS and authenticated SSH. SSH host identity was checked against
|
||||||
|
the already-trusted old endpoint key. No test push or user-authenticated
|
||||||
|
web login was performed by the agent.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
ansible-playbook ansible/site.yml --limit atlas --tags gitea_public_domain --check --diff
|
||||||
|
```
|
||||||
|
|
||||||
|
Client remotes do not update automatically. Update them deliberately after
|
||||||
|
checking repository paths; integrations and webhooks are separate operations.
|
||||||
|
For the verified infrastructure repository only:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git remote set-url origin ssh://git@git.fscotto.co:2222/fscotto/infra.git
|
||||||
|
```
|
||||||
|
|
||||||
|
Do not copy this path into unrelated clones. Verify Gitea's known SSH key
|
||||||
|
before accepting the new hostname's identity.
|
||||||
|
|
||||||
|
## Local DuckDNS retirement
|
||||||
|
|
||||||
|
Prometheus declares `server_duckdns_enabled: false`. On 2026-10-03 the explicit
|
||||||
|
Ansible cleanup removed the five-minute rocky cron entry and the private
|
||||||
|
`~/duckdns` directory containing only `duck.sh` and `duck.log`. The temporary
|
||||||
|
cleanup tasks and flag were subsequently removed from the playbook at the
|
||||||
|
operator's request. Only the disabled provisioning state remains; ordinary
|
||||||
|
provisioning cannot recreate the updater.
|
||||||
|
The external DuckDNS name, Vault token, disabled NPM hosts and certificates
|
||||||
|
remain untouched for a separate future decision.
|
||||||
|
The repeat cleanup changed nothing; ordinary DuckDNS provisioning was skipped.
|
||||||
|
The cron table had no remaining entries, NPM and the export timer were active,
|
||||||
|
and NPM administration still listened only on `127.0.0.1:81`.
|
||||||
|
|
||||||
|
## Operator-confirmed transition completion
|
||||||
|
|
||||||
|
On 2026-10-03 the operator confirmed completion of:
|
||||||
|
|
||||||
|
- Web login on the new Gitea hostname.
|
||||||
|
- Updates to remaining Git remotes, webhooks and integrations.
|
||||||
|
- Removal of obsolete DuckDNS NPM Proxy Hosts, unused certificates and the old upstream override.
|
||||||
|
- Review and removal of completed one-time procedures from the playbook.
|
||||||
|
|
||||||
|
These are operator confirmations, not new agent runtime checks or a test push.
|
||||||
|
At the earlier inspection the three old DuckDNS Proxy Hosts were disabled,
|
||||||
|
not deleted; that observation predates the confirmed cleanup. Existing backup
|
||||||
|
archives remain preserved. DNS/Pages/NPM changes were operator actions;
|
||||||
|
the Gitea application configuration change was deployed through Ansible.
|
||||||
@@ -2,19 +2,23 @@
|
|||||||
|
|
||||||
The playbook and both hosts have the dedicated identity, restricted SSH
|
The playbook and both hosts have the dedicated identity, restricted SSH
|
||||||
access, helpers, and systemd units. A manual export, pull, and temporary
|
access, helpers, and systemd units. A manual export, pull, and temporary
|
||||||
restore passed on 2026-09-30. Both timers are enabled; their first scheduled
|
restore passed on 2026-09-30. The first scheduled export and pull passed on
|
||||||
runs are pending, so daily operation is not yet verified.
|
2026-10-01. After NPM moved to its Quadlet, another manual export, pull, and
|
||||||
|
isolated restore passed on 2026-10-03. The first scheduled cycle after that
|
||||||
|
cutover is still pending. See `docs/prometheus-npm-quadlet.md`.
|
||||||
|
|
||||||
## Declared design
|
## Declared design
|
||||||
|
|
||||||
- Prometheus prepares a tar archive of Nginx Proxy Manager and Gitea data,
|
- Prometheus prepares a tar archive of Nginx Proxy Manager data and certificates,
|
||||||
their managed Compose configuration, SSH/firewalld/WireGuard configuration,
|
its active Quadlet and network definitions,
|
||||||
and the Gitea SSH path. NPM access logs and regenerable Gitea logs, sessions,
|
and SSH/firewalld/WireGuard configuration. Gitea now runs on Atlas and is no
|
||||||
temporary files, and indexers are excluded. The archive contains credentials,
|
longer included in new Prometheus exports. NPM access logs are excluded.
|
||||||
certificates, and the WireGuard private key: protect both copies accordingly.
|
The archive contains credentials, certificates, and the WireGuard private
|
||||||
- The approved consistency mode stops the managed Compose stack for the local
|
key: protect both copies accordingly.
|
||||||
tar creation at 02:00 Europe/Rome, then restarts it even if archiving fails.
|
- The approved consistency mode stops the NPM Quadlet for local tar creation
|
||||||
A manual test outside that window requires separate approval.
|
at 02:00 Europe/Rome, then restarts it even if archiving fails. After the
|
||||||
|
approved legacy cleanup, the helper requires the Quadlet active and has
|
||||||
|
no Compose dependency. A manual test outside that window requires separate approval.
|
||||||
- Prometheus publishes the archive with its checksum as a versioned, read-only
|
- Prometheus publishes the archive with its checksum as a versioned, read-only
|
||||||
source under `/var/lib/prometheus-backup-export`. A locked service account
|
source under `/var/lib/prometheus-backup-export`. A locked service account
|
||||||
has no sudo or supplementary groups. Its only authorized SSH key is forced
|
has no sudo or supplementary groups. Its only authorized SSH key is forced
|
||||||
@@ -51,18 +55,20 @@ runs are pending, so daily operation is not yet verified.
|
|||||||
account's key, and verify `sshd -T -C user=prometheus-backup,...` plus
|
account's key, and verify `sshd -T -C user=prometheus-backup,...` plus
|
||||||
read-only SSH denial tests after any SSH configuration change.
|
read-only SSH denial tests after any SSH configuration change.
|
||||||
3. During an agreed window, start the Prometheus export service manually.
|
3. During an agreed window, start the Prometheus export service manually.
|
||||||
Confirm Compose is healthy afterward, inspect the archive without exposing
|
Confirm the active NPM service is healthy afterward, inspect the archive
|
||||||
file contents, and verify the checksum/metadata.
|
without exposing file contents, and verify the checksum/metadata.
|
||||||
4. Start the Atlas pull service manually. Confirm the SSH host pin, source
|
4. Start the Atlas pull service manually. Confirm the SSH host pin, source
|
||||||
freshness, checksum, tar listing, published `latest`, retention behavior,
|
freshness, checksum, tar listing, published `latest`, retention behavior,
|
||||||
clean temporary directories, and healthy pool.
|
clean temporary directories, and healthy pool.
|
||||||
5. Independently restore the selected archive to an empty staging directory
|
5. Independently restore the selected archive to an empty staging directory
|
||||||
(never `/`) and compare the SQLite databases, Git repositories, NPM data,
|
(never `/`) and compare NPM SQLite, data, active Quadlet files, certificates,
|
||||||
Compose file, permissions, and representative files. Test application
|
permissions, and representative files. Historical pre-Gitea-cutover
|
||||||
startup only in an isolated environment or an approved restore window.
|
versions also include Gitea repositories; current versions do not. Test
|
||||||
6. The two timers were enabled after the manual test. Verify their calendars
|
application startup only in an isolated environment or an approved restore
|
||||||
and the next actual run. A successful manual test is not proof of scheduled
|
window.
|
||||||
operation.
|
6. Both timers are enabled. Verify their calendars and the next actual run
|
||||||
|
after any service-ownership change. A successful manual test is not proof
|
||||||
|
of a later scheduled cycle.
|
||||||
|
|
||||||
Narrow static validation:
|
Narrow static validation:
|
||||||
|
|
||||||
@@ -100,7 +106,26 @@ repository passed `git fsck`. The temporary restore directory was removed.
|
|||||||
This did not test application startup on an isolated host.
|
This did not test application startup on an isolated host.
|
||||||
|
|
||||||
After these checks, Ansible enabled the Prometheus 02:00 Europe/Rome export
|
After these checks, Ansible enabled the Prometheus 02:00 Europe/Rome export
|
||||||
timer and Atlas 03:00 Europe/Rome pull timer. The next scheduled occurrences
|
timer and Atlas 03:00 Europe/Rome pull timer. Their first scheduled run passed
|
||||||
were displayed for 2026-10-01. Atlas' health monitor now includes the pull
|
on 2026-10-01; Atlas verified and published `20261001T000001Z` as `latest`.
|
||||||
timer. Check both actual service results after the first scheduled run before
|
Atlas' health monitor includes the pull timer.
|
||||||
claiming unattended operation.
|
|
||||||
|
On 2026-10-03 the stopped-source version `20261003T091009Z` was verified and
|
||||||
|
pulled before the NPM cutover. The post-cutover version `20261003T091633Z`
|
||||||
|
was exported by the Quadlet-aware helper, checksum-verified, pulled to Atlas,
|
||||||
|
and restored to an isolated temporary directory. NPM SQLite `quick_check`
|
||||||
|
passed with ten proxy hosts and six certificate records. The archive contains
|
||||||
|
both Quadlet definitions. A manifest of all 70 regular Let's Encrypt files
|
||||||
|
and 12 symlinks, including content hashes and link targets, matched the live
|
||||||
|
Prometheus tree. No private key or secret content was printed. The next
|
||||||
|
scheduled export/pull is still pending observation.
|
||||||
|
|
||||||
|
## Post-cleanup validation (2026-10-03)
|
||||||
|
|
||||||
|
The operator-approved removal of legacy data and Compose fallback also
|
||||||
|
removed those backup input paths and the obsolete Gitea mount dependency.
|
||||||
|
A separately approved export and Atlas pull published `20261003T112906Z`.
|
||||||
|
Both SHA-256 checks passed; an isolated SQLite restore passed `quick_check`
|
||||||
|
and contained ten proxy hosts. Both active Quadlet definitions were present;
|
||||||
|
retired paths were absent. Existing backup archives were not deleted by cleanup.
|
||||||
|
The first scheduled cycle after these changes remains unverified.
|
||||||
|
|||||||
145
docs/prometheus-npm-quadlet.md
Normal file
145
docs/prometheus-npm-quadlet.md
Normal file
@@ -0,0 +1,145 @@
|
|||||||
|
# Prometheus NPM Quadlet cutover
|
||||||
|
|
||||||
|
## Current state (2026-10-03)
|
||||||
|
|
||||||
|
Nginx Proxy Manager runs as the **rootful** generated
|
||||||
|
`prometheus-npm.service` on Prometheus. The Quadlet files are
|
||||||
|
`/etc/containers/systemd/prometheus-npm.container` and
|
||||||
|
`/etc/containers/systemd/server-web.network`; the image is pinned by digest
|
||||||
|
in `ansible/inventory/host_vars/prometheus.yml`. The generated service is
|
||||||
|
wanted by `multi-user.target` and requires the generated network service.
|
||||||
|
The old Compose unit, Compose file and Gitea final-export helper were
|
||||||
|
removed by the operator-approved cleanup on 2026-10-03. The retired
|
||||||
|
application data and empty legacy directories were also removed.
|
||||||
|
Prometheus host vars set `server_legacy_stack_retired: true` so normal runs
|
||||||
|
do not recreate those files. Destructive deletion still requires a separate
|
||||||
|
cleanup tag and explicit extra-var.
|
||||||
|
|
||||||
|
There was **no data copy** in this cutover. The Quadlet reuses the existing
|
||||||
|
`/opt/npm/data:/data` and `/opt/npm/letsencrypt:/etc/letsencrypt` bind mounts
|
||||||
|
with the same container name and `server_web` bridge (`10.89.0.0/24`). Ports
|
||||||
|
80 and 443 remain public; administration port 81 remains bound to
|
||||||
|
`127.0.0.1`. Gitea stays on Atlas, and NPM remains on Prometheus. The
|
||||||
|
Compose fallback is no longer installed. The Quadlet uses `Pull=missing`,
|
||||||
|
not an automatic floating-tag update.
|
||||||
|
|
||||||
|
## Cutover and recovery boundaries
|
||||||
|
|
||||||
|
The separate `scripts/cutover_prometheus_npm_quadlet.sh` was run **once** in
|
||||||
|
the approved outage window, after source backup version
|
||||||
|
`20261003T091009Z` was checksum-verified and pulled to Atlas. Its preflight
|
||||||
|
required exactly the Compose owner, an inactive generated Quadlet, the
|
||||||
|
expected image, and the current backup version. The execution held the
|
||||||
|
backup-export lock, stopped the export timer, stopped and disabled Compose,
|
||||||
|
started the Quadlet, checked the exact image ID, SQLite database counts,
|
||||||
|
certificate content, Nginx configuration, and local Gitea/Syncthing HTTPS,
|
||||||
|
then restarted the timer. Its failure trap would have restarted Compose.
|
||||||
|
**Do not rerun that forward-cutover script after success**: its preconditions
|
||||||
|
intentionally reject an active Quadlet.
|
||||||
|
|
||||||
|
Recovery is now a Quadlet rebuild and restoration from a verified Atlas
|
||||||
|
backup, with an explicit outage decision before replacing live NPM state.
|
||||||
|
The old Compose owner is no longer installed; reintroducing it would require
|
||||||
|
a separately reviewed configuration and outage plan. The historical
|
||||||
|
in-window rollback trap is not a supported post-cleanup rollback procedure.
|
||||||
|
Do not restore an old database over a live instance or remove NPM bind mounts.
|
||||||
|
|
||||||
|
## Verified evidence
|
||||||
|
|
||||||
|
- Immediately after cutover, `prometheus-npm.service` was active with zero
|
||||||
|
recorded restarts; Compose was inactive/disabled. The generated
|
||||||
|
`multi-user.target.wants` link and network dependency were present. An
|
||||||
|
actual reboot has not been performed solely for this test.
|
||||||
|
- The running image ID matched the prior Compose image. Podman showed the
|
||||||
|
original two bind mounts, `server_web`, public 80/443, and loopback-only 81.
|
||||||
|
External HTTPS to Gitea and Syncthing returned 200 with TLS verification
|
||||||
|
result 0. External access to TCP/81 timed out.
|
||||||
|
- The first **manual post-cutover** export `20261003T091633Z` succeeded with
|
||||||
|
the Quadlet as its active owner. The Atlas pull published that version;
|
||||||
|
its SHA-256 payload check passed. An isolated restore passed NPM SQLite
|
||||||
|
`quick_check` with ten proxy hosts and six certificate records. Both
|
||||||
|
Quadlet definitions were present in the tar archive.
|
||||||
|
- A path/content manifest of all 70 regular Let's Encrypt files and the
|
||||||
|
path/target manifest of all 12 symlinks in the Atlas archive exactly
|
||||||
|
matched the live Prometheus tree (aggregate SHA-256
|
||||||
|
`ce0965fbd3ff44bb8502ed9f314e0131edd86d822039de115b39f6a2273c2da8`).
|
||||||
|
The earlier apparent 70-vs-82 count was only a regular-file-versus-symlink
|
||||||
|
counting difference, not missing certificate data. No certificate key
|
||||||
|
contents were exposed during comparison.
|
||||||
|
- The targeted `--tags npm_quadlet` normal Ansible run completed with
|
||||||
|
`changed=0`, and the backup export timer remained active/enabled.
|
||||||
|
|
||||||
|
The first unattended 02:00 Europe/Rome export and 03:00 Atlas pull **after**
|
||||||
|
this cutover have not yet occurred. Check their service results and the
|
||||||
|
published version after the next cycle; the successful manual cycle proves
|
||||||
|
the new path works but not its next scheduled execution.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
ANSIBLE_LOCAL_TEMP=/tmp/ansible-local \
|
||||||
|
ansible-playbook ansible/site.yml --limit prometheus --tags npm_quadlet --check --diff
|
||||||
|
sudo systemctl status prometheus-npm.service prometheus-backup-export.timer
|
||||||
|
sudo systemctl show podman-compose-server.service -p LoadState # expected: not-found
|
||||||
|
```
|
||||||
|
|
||||||
|
The backup archive includes credentials, certificates, and WireGuard
|
||||||
|
configuration. Do not publish it or print its contents in diagnostics; see
|
||||||
|
`docs/prometheus-backup.md` for the restricted pull and restore procedure.
|
||||||
|
|
||||||
|
## Selective legacy image cleanup
|
||||||
|
|
||||||
|
On 2026-10-03 opt-in Ansible tasks removed only the unused Gitea 1.25.2,
|
||||||
|
Navidrome latest and PostgreSQL 13 rootful images, without force or global
|
||||||
|
prune. Podman refuses images referenced by existing containers. The second
|
||||||
|
run changed nothing. NPM remained active with zero restarts; local admin
|
||||||
|
and public Gitea HTTPS returned 200. Backup timer and SSH proxy stayed active.
|
||||||
|
|
||||||
|
Validation:
|
||||||
|
```bash
|
||||||
|
ansible-playbook ansible/site.yml --limit prometheus --tags server_image_cleanup --check --diff -e server_legacy_image_cleanup=true
|
||||||
|
```
|
||||||
|
|
||||||
|
The image cleanup defaults to disabled and carries the `never` tag.
|
||||||
|
Check mode probes image presence but skips removal; it does not prove
|
||||||
|
Podman would accept deletion. It never removes NPM resources.
|
||||||
|
|
||||||
|
## Approved legacy data and fallback cleanup
|
||||||
|
|
||||||
|
The operator explicitly approved deletion on 2026-10-03. The separate
|
||||||
|
`server_legacy_cleanup` tasks removed `/opt/gitea`, `/home/git/.ssh`,
|
||||||
|
`/opt/navidrome`, `/opt/postgres`, `/opt/music`, `/opt/containerd`,
|
||||||
|
`/opt/docker`, the old Compose unit and the final Gitea export helper.
|
||||||
|
The empty `/home/git` parent is removed only with `rmdir`, after confirming
|
||||||
|
the Git account is absent. Guards reject symlinked paths, nested mounts,
|
||||||
|
unexpected containers, container users of these paths, unexpected content
|
||||||
|
in the empty legacy trees, and an active Compose or export service.
|
||||||
|
The second cleanup run changed nothing.
|
||||||
|
|
||||||
|
Before deletion, Ansible removed obsolete backup input paths and the
|
||||||
|
Gitea mount dependency. Normal Compose/template/final-export task checks
|
||||||
|
changed nothing and did not recreate the retired files. Deletion is opt-in:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
ansible-playbook ansible/site.yml --limit prometheus --tags server_legacy_cleanup --check --diff -e server_legacy_cleanup=true
|
||||||
|
```
|
||||||
|
|
||||||
|
Remove check mode only for approved deletion. No active NPM data, certificate,
|
||||||
|
image, network, volume, SSH proxy, WireGuard configuration or backup archive
|
||||||
|
is removed. No services were restarted by the cleanup.
|
||||||
|
|
||||||
|
After separate approval for the brief managed NPM pause, the new export
|
||||||
|
`20261003T112906Z` completed successfully and was pulled to Atlas. SHA-256
|
||||||
|
passed on both hosts; an isolated SQLite restore passed `quick_check` and
|
||||||
|
contained ten proxy hosts. Both Quadlet definitions were present, and
|
||||||
|
retired paths were absent. Temporary restore files were removed.
|
||||||
|
NPM was active with zero automatic restarts; primary public Gitea HTTPS
|
||||||
|
returned 200 with valid TLS. Backup timer, SSH proxy and WireGuard stayed active.
|
||||||
|
The first scheduled post-cleanup cycle remains unverified.
|
||||||
|
|
||||||
|
After separate operator approval on 2026-10-03, the unused secondary hostname
|
||||||
|
`git.ov-ad3410.infomaniak.ch` was removed from the declared domains and
|
||||||
|
the managed NPM runtime override. Its Proxy Host (id 10) was already
|
||||||
|
soft-deleted, with no generated config or associated certificate. Historical
|
||||||
|
deleted records and backup archives are preserved; no DNS changes were made.
|
||||||
|
Only `git.fscotto.duckdns.org` remains declared for the Gitea override.
|
||||||
|
Nginx validation and reload passed without restarting NPM; the primary
|
||||||
|
public HTTPS endpoint returned 200 with valid TLS.
|
||||||
106
scripts/cutover_prometheus_npm_quadlet.sh
Normal file
106
scripts/cutover_prometheus_npm_quadlet.sh
Normal file
@@ -0,0 +1,106 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Run on Prometheus as root with the exact verified source-export version.
|
||||||
|
set -Eeuo pipefail
|
||||||
|
|
||||||
|
expected_export=${1:?Pass the verified Prometheus backup export version}
|
||||||
|
mode=${2:---preflight}
|
||||||
|
[[ $expected_export =~ ^[0-9]{8}T[0-9]{6}Z$ ]] || exit 2
|
||||||
|
[[ $mode == --preflight || $mode == --execute ]] || exit 2
|
||||||
|
[[ $EUID -eq 0 ]] || { echo 'Run as root on Prometheus' >&2; exit 2; }
|
||||||
|
|
||||||
|
compose_unit=podman-compose-server.service
|
||||||
|
quadlet_unit=prometheus-npm.service
|
||||||
|
backup_timer=prometheus-backup-export.timer
|
||||||
|
versions=/var/lib/prometheus-backup-export/versions
|
||||||
|
quadlet_file=/etc/containers/systemd/prometheus-npm.container
|
||||||
|
|
||||||
|
exec 9>/run/lock/prometheus-backup-export.lock
|
||||||
|
flock -n 9 || { echo 'Backup/export lock is busy' >&2; exit 1; }
|
||||||
|
|
||||||
|
systemctl is-active --quiet "$compose_unit"
|
||||||
|
if systemctl is-active --quiet "$quadlet_unit"; then
|
||||||
|
echo 'NPM Quadlet is already active; refusing overlapping cutover' >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
[[ $(systemctl show "$quadlet_unit" -p LoadState --value) == loaded ]]
|
||||||
|
[[ $(systemctl is-enabled "$compose_unit") == enabled ]]
|
||||||
|
[[ $(readlink "$versions/current") == "$expected_export" ]]
|
||||||
|
image=$(sed -n 's/^Image=//p' "$quadlet_file")
|
||||||
|
[[ $image =~ ^docker\.io/jc21/nginx-proxy-manager@sha256:[a-f0-9]{64}$ ]]
|
||||||
|
podman image exists "$image"
|
||||||
|
(cd "$versions/current" && sha256sum -c payload.sha256 && tar -tf payload.tar >/dev/null)
|
||||||
|
curl -fsS --connect-timeout 2 --max-time 5 -o /dev/null http://127.0.0.1:81/
|
||||||
|
old_image=$(podman inspect nginx-proxy-manager --format '{{.Image}}')
|
||||||
|
|
||||||
|
data_signature() {
|
||||||
|
python3 - <<'PY'
|
||||||
|
import hashlib, os, sqlite3
|
||||||
|
db = sqlite3.connect('file:/opt/npm/data/database.sqlite?mode=ro', uri=True)
|
||||||
|
assert db.execute('pragma quick_check').fetchone()[0] == 'ok'
|
||||||
|
counts = [db.execute('select count(*) from ' + table).fetchone()[0]
|
||||||
|
for table in ('proxy_host', 'certificate', 'user')]
|
||||||
|
db.close()
|
||||||
|
digest = hashlib.sha256()
|
||||||
|
for root, dirs, files in os.walk('/opt/npm/letsencrypt'):
|
||||||
|
dirs.sort()
|
||||||
|
for name in sorted(files):
|
||||||
|
path = os.path.join(root, name)
|
||||||
|
with open(path, 'rb') as stream:
|
||||||
|
digest.update(path.encode() + b'\0' + stream.read())
|
||||||
|
print(*counts, digest.hexdigest())
|
||||||
|
PY
|
||||||
|
}
|
||||||
|
before=$(data_signature)
|
||||||
|
if [[ $mode == --preflight ]]; then
|
||||||
|
echo 'NPM Quadlet cutover preflight passed; no service was changed'
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
stopped_old=false
|
||||||
|
rollback() {
|
||||||
|
rc=$?
|
||||||
|
trap - EXIT
|
||||||
|
if (( rc != 0 )) && "$stopped_old"; then
|
||||||
|
echo 'NPM Quadlet cutover failed; restoring Compose' >&2
|
||||||
|
systemctl stop "$quadlet_unit" || true
|
||||||
|
systemctl enable "$compose_unit" || true
|
||||||
|
systemctl start "$compose_unit" || true
|
||||||
|
systemctl start "$backup_timer" || true
|
||||||
|
curl -fsS --connect-timeout 2 --max-time 10 -o /dev/null http://127.0.0.1:81/ || true
|
||||||
|
fi
|
||||||
|
exit "$rc"
|
||||||
|
}
|
||||||
|
trap rollback EXIT
|
||||||
|
|
||||||
|
stopped_old=true
|
||||||
|
systemctl stop "$backup_timer"
|
||||||
|
systemctl stop "$compose_unit"
|
||||||
|
if podman container exists nginx-proxy-manager; then
|
||||||
|
echo 'Compose left the NPM container behind; refusing duplicate ownership' >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
systemctl disable "$compose_unit"
|
||||||
|
systemctl start "$quadlet_unit"
|
||||||
|
|
||||||
|
ready=false
|
||||||
|
for _ in {1..60}; do
|
||||||
|
if curl -fsS --connect-timeout 2 --max-time 3 -o /dev/null http://127.0.0.1:81/; then
|
||||||
|
ready=true
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
|
"$ready"
|
||||||
|
systemctl is-active --quiet "$quadlet_unit"
|
||||||
|
[[ $(podman inspect nginx-proxy-manager --format '{{.Image}}') == "$old_image" ]]
|
||||||
|
podman exec nginx-proxy-manager nginx -t
|
||||||
|
[[ $(data_signature) == "$before" ]]
|
||||||
|
for hostname in git.fscotto.duckdns.org syncthing.fscotto.duckdns.org; do
|
||||||
|
status=$(curl -ksS --connect-timeout 3 --max-time 10 \
|
||||||
|
--resolve "$hostname:443:127.0.0.1" -o /dev/null -w '%{http_code}' \
|
||||||
|
"https://$hostname/")
|
||||||
|
[[ $status == 200 ]]
|
||||||
|
done
|
||||||
|
systemctl start "$backup_timer"
|
||||||
|
stopped_old=false
|
||||||
|
echo 'NPM Quadlet cutover passed local application and data checks'
|
||||||
@@ -1,83 +1,71 @@
|
|||||||
$ANSIBLE_VAULT;1.1;AES256
|
$ANSIBLE_VAULT;1.1;AES256
|
||||||
61353065386233646137323235306631353635663530363237636231316265643562353465323430
|
37646664613266633436346262613633613830623366383138613432366365373765353230333134
|
||||||
6165646466623962313835313537633137633766373930380a316335323962616265643136346666
|
3332333764313337396637323133623937343738373133370a333930356365653034323235643230
|
||||||
63336133336131346336383534356637623831363138323165633262386333363535393365383233
|
36633864343161653833356636373931383761663864663334336236373733326266386639366335
|
||||||
6234393835653439370a313963313365373633323464343263383661383336363662633133643232
|
3131313661313637320a313937633361646333333962303335333233346166343831373039663964
|
||||||
34366634383862363635653034313531623330396639616462343630326162316535643465653532
|
33366532386135663463643965363766643063616436316463666232666138323236346231303537
|
||||||
36326534333637376462353561343964633636366331363833313263353133383636623537303663
|
34303535333866376430363063623934623761373865656231656661383935393866353566346430
|
||||||
35393032316439336666343161653439643638376134363535656262343963393365623432336433
|
64333434613432376436343438343561383235366631623730653533633535326237666265653439
|
||||||
35383934313762313037326430316666363731666231336534326661353034333063643364343230
|
34366264653665643063663361313339663034323932326233366636326336323432303434373765
|
||||||
65333739303566366263333565333465613136646237623937393733623438613832393634663463
|
36316532316265343434383438623239666232373633626330333464303361643630303635643834
|
||||||
39376131313234333039633735613233373931613232653036663665316636303961653834366339
|
39313136623830303762313462343637633763626333393033346637663931663238653734626131
|
||||||
36353730316132316233303964303839363161346564396163336137663134353062363733656430
|
38393963646563333732353531653239643330326539643538323164343934356166343034316565
|
||||||
37643339326661653031376265646132623162373562393437373437313732396537383939333666
|
33346431333735636537613930383331393265313962626234363237373562313231393061326439
|
||||||
62353036316633306666313461663033303830393765396131643035353730383931646239663935
|
64363765323935316661353531366165343139633963336139313737306332613364643031666161
|
||||||
32626461316364386135303761383837613063336466363162323332663764616464373565383231
|
30386362643930316265616564306336633133303166363665333462316265313364393939306162
|
||||||
61346463336566346533326535376439643133613762383633396131323632356533636139336365
|
31303639313933356337386134623934663461643161306666633261653538633232343036653833
|
||||||
62393838316634623932643034376631333539343965383436613364643962363834346337353334
|
66316466636233343136393765636333353230353738313833333265663238303730313936326664
|
||||||
32656439366439313734353963343133333533653839613632323338336131373566613835393536
|
38373239353162363438323964333030666563346161643437326335666162356264396135393532
|
||||||
31663433616334373432376531346435336530303936356461303163646463613661643161313661
|
63363862373136346532653734336335616132386237303031363433663132343861633937386130
|
||||||
66663866343565616631616338353737356164353562366164383736346131666662623132333466
|
30633938616364303462303030303966303939633066393264303462393730363233373937356439
|
||||||
39383865653631373232393433663430643961646265386166333137643966303834363262373636
|
36663533376232663737613734653532313136343939663539373866333638396266666163383864
|
||||||
62396434373363353636376133666133663162653265313139313732353639336232333862643036
|
63613532393334373539346338616163383637633237666234613437663966653733616361353830
|
||||||
64386231336561396537326139346566306434633934343038663165396665363032383466633662
|
61656666376133363330633863346637376266343134633037313132313361366638616261363839
|
||||||
62336163633964363435386630343966333162333730336138333239646631633132663931376462
|
39393062396237666333303937363536346561343763663133323236393037383532396465336138
|
||||||
33663139356261313065376636613930353735396131306538306664646135636336643032623131
|
35613463356532376534386433626337613030343266353332306462306463336336343830666138
|
||||||
38346264333331353633326535326431626563323036313665643337353563333339646430386564
|
33656138363837633337393865643633623261613335366263643162663637623636666162653632
|
||||||
31613435383036313430316366323636663735326336393338353835323861333564363832656462
|
30626238616266323332616234393838343330663662393433366630393566316336636530303165
|
||||||
35336435623261326363633033316130393062616339353263643062633331646137376135656365
|
38343665623437356636643236393734396264356632326133623264633862633333626330336663
|
||||||
35636139336564346164616235616431326531333433646330386134323932373339646536356464
|
61376263656665653731636133316161653635323138303866623862303065366232633736623336
|
||||||
66343533326534326165323564663533653666633035343163633832393361336462343937623165
|
39656666386435343062656138313061616661313966326432663236626631316162623961616636
|
||||||
62383931326630363036396333313931393836366439653433623165666166356338653364336534
|
35343939613262303066626537396164616666316265643065373638663436643961336138313862
|
||||||
35333936653833386163633738326164386166613561333530633937343230363366333662666539
|
39666163646538356338356631346534633139643636393866646462646533363265663234633761
|
||||||
39333361633933663735303438663239303536363433313962643137386533633539326365383765
|
65363661336138353239656165393836386134666331663036653132306433343764643666306333
|
||||||
37636538386339333935386132353265353031643662616330316463623661663738353433313830
|
33623661626565633333306337303263633335386632386330353730316436313931326164363862
|
||||||
36373963633166333464653338343830373063323536383364393033393235326639613662343737
|
37616265653161633632353865346639653961653836353962303762336535666266386535363165
|
||||||
38663362636331343061646465313237313431373433353361353265333766633463353632646536
|
39653138646663376634323131613463333035326639313266613830616431316131383464353533
|
||||||
31323231306138323031396630656538363930373439336234343963616334363632653738316465
|
62656634346637636164626461613137303461633761336232373133653532323566303136663030
|
||||||
63653938373830336362313238656266613362636634616537653863336132343931616262396130
|
30633337346534636566343934306662356238396365306563336666623435353731613136333036
|
||||||
66393239303866656232653832343132366537333537343635666563343639323433383163613335
|
36343436373932323265306639363761353364383635333136366231373166613861633032343233
|
||||||
39613533376634316133633430303535306266656333626264343733666335393661666561396633
|
61376338616630343639333964356162613332323835333730333135356665383431626138643534
|
||||||
39346265316137326465326635396362333565393133623637633132616232326263663662343137
|
66393966666465303763316230386538393863303063386564303165303962346139373338303436
|
||||||
33363733306135363361643031306265363733656362386666306334333035393839636533343363
|
39373032663538323532323766353864643338326561313564373562616430326264386362666532
|
||||||
35396638616636633639343930373136376339346162393061393765363837646365383866636131
|
36613132306462336631363035343732636465343562643430343035373961366566383130656165
|
||||||
33653465666239393133616232636231333332396138376332393664343364643835306530393238
|
64613938393265343037633161653937323933646637653036306532366237313838346361333932
|
||||||
34663237303530303837663535646263393931373531393039356336316561653130356262636562
|
34663565653264626137323239336532643262356166633665313761336162303635346666383863
|
||||||
38336362326639653237626634376334666565653036353236313634376364626338646538386536
|
61383930383033626337383366353766393536653135383062656639323361353539356232613736
|
||||||
38626636386466373566646166393963643164343536373236396138303532393161363335386638
|
63646235663363333333623463313961326533653236363938383765663439613832653039386436
|
||||||
32633032393737626363613463323366366637616361313537356136626661626633613739323338
|
38393734633536313731323437336332353564363564333736663037386530333639326338656561
|
||||||
35383963666431343566356562333234663936376562616638636261303466633539376334303331
|
66336637353238383231613666313261383234336531666132396230373931623363323832633064
|
||||||
39303834663234663063356233313962326664383839393832303462643636393034383434303465
|
39613036346166393936613939363865616135653830366435643538336365353333613831353962
|
||||||
64333635376135326333356435373734643430623736373234643335343130383066326436356664
|
36623537363434373137633063373934383439333462646361613737303239643834303535366138
|
||||||
63346663326364343634303930343338336139313864316165366232643537366635653764353763
|
34656465316431656461373737643537303936636539383934373831616438343965373765373535
|
||||||
31363863633261643263303433373330366161323166366462336332313135366338393334653764
|
63653164363731653030303466646539636361383664343763646163663238383435653035653666
|
||||||
66353733653137663835663731373364613030373334663061313433373861613665363236633130
|
63383165626365653261303834333234626534396333353231303261396361616233363334383336
|
||||||
65613965366636343465336533613438373466383737373366653965633437323562643966396431
|
33316462636133336132656364613439396131613565646565396365316238323962353462653736
|
||||||
39303033643438633762633263326132663466643438656366363431616237633031333936313831
|
64386139313266663963643962363133386133393166306163626632646463333363323830306164
|
||||||
30323930383233313032323638356333626230333764363662313662646536643839353032353462
|
35353936653137383761326132373739306163613764386531613032313235373331303530383633
|
||||||
30326166653937353130623133303533343934633565393831623033303234316330353432313266
|
64646533313434653734366233633535323564386431306538633666383661303038613330653832
|
||||||
30636536633933376365623665616262663236383731633633346232613366333137396139306363
|
34643463396137643034353439653334653836333161396130363637326339383363303037306330
|
||||||
35633336643266326335303261666666653536666630613639376336373237646134306462616537
|
61353635633334343432646461396439393439383639336139316161373737333961653731393333
|
||||||
33343561373162666332613634643837343566646161373065366637653135613632353334636363
|
61636164343838346365373736356161386430356533303331333838333732363233613931613863
|
||||||
63363232303963646530333366663862323264326536643337323266396566316233613630303637
|
66633662383466306332366563373865323861323833353238356563363635313463366333653432
|
||||||
66646366376466373931613734363931316230323063373666653062373364396433633762633762
|
65303839653963376566383737346231343663363363313332383365646363373737323839613564
|
||||||
38613933323733653238383935623230383562646563363833653838636165626365646537383639
|
34613362303335316363363661653639386538326337386537333765643161613961316531613563
|
||||||
33666535656363393562316336633439636138373365623431393965653765306138646234663938
|
38386564636637643762643830666138383361396233303339643665343261356462393830376662
|
||||||
65653133663663393731646337386535333261643932336132396237323930306136643534353930
|
32656334346536636536343263336565333234353831616565366538393661353561376538346334
|
||||||
65636438396432623034626561613137336138623265393064383034623863303166356138393564
|
61396135623230366433303932396130636331333263316333643861626564343330386636613063
|
||||||
37373164626634653662326234333539663735323464613334616130643937373730363263633366
|
32383061616435643736653264313839363232346332343565336464353138396339623533393237
|
||||||
31393937326432386165343338313031376565313866363731643534313233303064373935303538
|
38353632646565323735643462626239663736643033643231613464663866663262366632353434
|
||||||
31343832336230393636653432653162336361383963633766343461653466316337353931333363
|
37363866343239363131633464316133396462353336613962306332343563333962333934616330
|
||||||
63313137303564336630343937356564643763383764613362366634373362666465626334336539
|
3536356634376131633039373834376533633065303533653333
|
||||||
64366533376165306532343461613265366266383862323032333465336161663161376630316465
|
|
||||||
30306562666163646235656664653635366461366435663961623635383437663564356563346462
|
|
||||||
31636234663765623838333237393239373564366262613637363938653463396530613963643837
|
|
||||||
38636634376637366332623035313465393762653865623130336263343663303066366135616639
|
|
||||||
63333964356466613038303263366462346261353030646532366361393965306435613131316463
|
|
||||||
65366266376637323764643239323730366565633335666638666334663635373961303637383861
|
|
||||||
35313431646434656562333937663837393038386361616630626532636339306432353434656165
|
|
||||||
33663261383166386432383465666136376237346565303164363461666663346130346162316338
|
|
||||||
62373061353034316234303835663439396434343738303764376665336239626238386436386234
|
|
||||||
61306166383637366266393730323732386163366261393630336431633862353761343763363665
|
|
||||||
61323039396234393835303633363339373633653334343766653032313230343464326664356566
|
|
||||||
3462623830666664626633373966363866333337383730313066
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ vault_git_work_email: "REPLACE_ME"
|
|||||||
vault_git_work_gpg: "REPLACE_ME"
|
vault_git_work_gpg: "REPLACE_ME"
|
||||||
vault_ikaros_authorized_ssh_keys:
|
vault_ikaros_authorized_ssh_keys:
|
||||||
- "ssh-ed25519 REPLACE_ME"
|
- "ssh-ed25519 REPLACE_ME"
|
||||||
vault_aegis_icloudpd_apple_id: "REPLACE_ME"
|
vault_atlas_icloudpd_apple_id: "REPLACE_ME"
|
||||||
vault_atlas_admin_password_hash: "REPLACE_WITH_A_SHADOW_COMPATIBLE_HASH"
|
vault_atlas_admin_password_hash: "REPLACE_WITH_A_SHADOW_COMPATIBLE_HASH"
|
||||||
vault_atlas_samba_password: "REPLACE_ME"
|
vault_atlas_samba_password: "REPLACE_ME"
|
||||||
vault_atlas_immich_db_password: "REPLACE_ME"
|
vault_atlas_immich_db_password: "REPLACE_ME"
|
||||||
|
|||||||
Reference in New Issue
Block a user