Cut the comment bloat from the Podman playbooks
Comment blocks now stay within three lines and explain only the non-obvious. Long histories, include examples, and commented-out code are gone. No task, key, or value changed; the only data change is comment text inside the generated unit files.
This commit is contained in:
1 parent
2aab1aec1e
commit
476a6d7cd0
85 files changed
+372
-2433
No files matched your search
@@ -1,27 +1,15 @@
|
||||
---
|
||||
# Caddy is its own playbook (caddy/playbook.yml) and a rootless Quadlet unit
|
||||
# there. These handlers run as the connection user, so `systemctl --user` and
|
||||
# `podman exec` work without any XDG_RUNTIME_DIR juggling.
|
||||
|
||||
# Notified by this role when the Caddyfile changes. A reload keeps existing
|
||||
# connections; a restart would briefly drop every hosted site.
|
||||
#
|
||||
# Note the config path: /etc/caddy/Caddyfile is the mount inside the container,
|
||||
# not {{ caddyfile_path }}, which is the host side of it.
|
||||
# A reload keeps live connections; a restart would drop every hosted site.
|
||||
# The path is inside the container, not the host {{ caddyfile_path }}.
|
||||
- name: Reload Caddy configuration
|
||||
ansible.builtin.command: >-
|
||||
podman exec {{ caddy_name }} caddy reload --config /etc/caddy/Caddyfile
|
||||
changed_when: true
|
||||
listen: "Reload Caddy"
|
||||
|
||||
# Notified by caddy/roles/register when this service's network unit, or the
|
||||
# drop-in that attaches Caddy to it, is written. Quadlet has no live equivalent
|
||||
# of `docker network connect`, so the container has to be recreated — a brief
|
||||
# restart of every hosted site, not just this one. See caddy/readme.md,
|
||||
# "Trade-off worth knowing".
|
||||
#
|
||||
# Defined after the reload above so that when both are notified the cheap config
|
||||
# reload happens first.
|
||||
# Quadlet cannot attach a network live, so Caddy must be recreated.
|
||||
# Defined after the reload so the cheap reload runs first when both are notified.
|
||||
- name: Restart Caddy
|
||||
ansible.builtin.systemd_service:
|
||||
name: "{{ caddy_name }}.service"
|
||||
|
||||
@@ -1,14 +1,4 @@
|
||||
---
|
||||
# Append this site's block to the shared Caddyfile.
|
||||
#
|
||||
# The Caddyfile is a bind mount into the Caddy container, so Caddy sees the
|
||||
# change as soon as the file is written; the handler only asks Caddy to re-read
|
||||
# it. That is a reload, not a restart, so the other hosted sites are untouched.
|
||||
#
|
||||
# blockinfile is idempotent on its own via the marker, so there is no need to
|
||||
# slurp the file and compare first — which also matters because slurp *fails*
|
||||
# when the Caddyfile does not exist yet, on a host where the Caddy playbook has
|
||||
# not run.
|
||||
|
||||
- name: "Add the {{ host }} site block to the Caddyfile"
|
||||
ansible.builtin.blockinfile:
|
||||
|
||||
@@ -1,13 +1,6 @@
|
||||
---
|
||||
# Postgres is its own playbook (postgres/playbook.yml) and a rootless Quadlet
|
||||
# unit there. This handler runs as the connection user, so `systemctl --user`
|
||||
# works without setting XDG_RUNTIME_DIR.
|
||||
#
|
||||
# Required by postgres/roles/attach, which notifies it whenever this app's
|
||||
# drop-in changes: a new drop-in changes the generated unit, so Postgres must be
|
||||
# recreated to join the network — Quadlet has no live equivalent of
|
||||
# `podman network connect`. That is a few seconds of downtime for every attached
|
||||
# app, not just this one. See postgres/readme.md, "The trade-off".
|
||||
# A new drop-in changes the generated unit, so Postgres must be recreated to join the network.
|
||||
# That restarts every attached app, not just this one.
|
||||
- name: Restart Postgres
|
||||
ansible.builtin.systemd_service:
|
||||
name: "{{ postgres_unit }}"
|
||||
|
||||
@@ -1,32 +1,11 @@
|
||||
---
|
||||
# Attach this app's network to the shared Postgres unit.
|
||||
#
|
||||
# Postgres knows nothing about its clients, exactly like Caddy: a service joins
|
||||
# by dropping 50-hiwikijs.conf and the shared 10-network-aliases.conf next to
|
||||
# postgres.container. The canonical way to do that is the shared include below —
|
||||
# it writes the same bytes every service writes, asserts that hiwikijs.network
|
||||
# already exists, and notifies the "Restart Postgres" handler defined in this
|
||||
# role.
|
||||
#
|
||||
# This runs in the roles phase, which is after the register include in
|
||||
# playbook.yml's pre_tasks has created hiwikijs.network.
|
||||
|
||||
# Runs in the roles phase, after the register include in pre_tasks created the network.
|
||||
- name: Attach Wiki.js to Postgres
|
||||
ansible.builtin.include_tasks: "{{ playbook_dir }}/../postgres/roles/attach/tasks/main.yaml"
|
||||
|
||||
# On a first attach both drop-ins are new, so Postgres has to be recreated to
|
||||
# join hiwikijs_net — and the shared 10-network-aliases.conf is what creates the
|
||||
# `db` alias DB_HOST asks for. That restart is a *handler*, which by default runs
|
||||
# at the end of the play, after the wikijs role has already started the app. The
|
||||
# app would then come up before `db` resolves, fail its own HTTP probe, and fail
|
||||
# the play on a machine where nothing is actually wrong.
|
||||
#
|
||||
# Flushing applies the new drop-in before the app starts. On later runs the
|
||||
# drop-ins are unchanged, nothing is pending, and this is a no-op.
|
||||
#
|
||||
# Note that flush_handlers flushes *everything* pending, which includes the
|
||||
# "Restart Caddy" that the register include notified in pre_tasks — and that is
|
||||
# the right thing here: the Caddy drop-in is new too, and Caddy has to be
|
||||
# recreated to join the network before it can proxy to hiwikijs.
|
||||
# The restart is a handler, so it would run after the wikijs role starts the app.
|
||||
# Flushing applies the new drop-in before the app starts; later runs are a no-op.
|
||||
# Flush also applies Caddy's pending restart, which is right: Caddy must join the network to proxy.
|
||||
- name: Apply the Postgres network change before starting Wiki.js
|
||||
ansible.builtin.meta: flush_handlers
|
||||
@@ -1,16 +1,11 @@
|
||||
---
|
||||
# All handlers run as the connection user ({{ podman_user }}), so systemctl
|
||||
# --user works without setting XDG_RUNTIME_DIR.
|
||||
|
||||
- name: Reload systemd user units
|
||||
ansible.builtin.command: systemctl --user daemon-reload
|
||||
changed_when: true
|
||||
listen: Reload systemd user units
|
||||
|
||||
# A changed environment file or unit file changes the generated unit, so Wiki.js
|
||||
# is recreated. The wiki itself is in Postgres and the two data directories are
|
||||
# bind mounts, so a recreate loses nothing — but it is a few seconds of downtime
|
||||
# for the one site.
|
||||
# A recreate keeps the wiki in Postgres and the bind mounts, but costs a few seconds of downtime.
|
||||
- name: Restart Wiki.js
|
||||
ansible.builtin.systemd_service:
|
||||
name: "{{ unit_name }}"
|
||||
|
||||
@@ -1,19 +1,6 @@
|
||||
---
|
||||
# Wiki.js as a rootless Podman Quadlet unit.
|
||||
#
|
||||
# Everything here runs as {{ podman_user }} — the connection user. No become, no
|
||||
# XDG_RUNTIME_DIR: the SSH connection gave us a real PAM session, so systemd's
|
||||
# user manager is reachable through the standard environment.
|
||||
|
||||
# /wiki/data/content is the image's declared VOLUME, and /wiki/data/uploads is
|
||||
# where Wiki.js's default "Local File System" storage target writes. Both are
|
||||
# empty on monoco, because the whole wiki — pages, history, users, and the 5.8 MB
|
||||
# of uploaded assets in the `assetData` table — lives in Postgres (see readme.md).
|
||||
#
|
||||
# They are created here anyway. The database is the store, but nothing the app
|
||||
# does write may end up in the container's writable layer, where no backup would
|
||||
# ever find it — that is the audit's finding #1 (docs/podman-compat-audit.md
|
||||
# §3.1), and the reason the old hiwikijs-backup.sh archived nothing.
|
||||
# Both must be bind mounts so nothing the app writes lands in the container layer.
|
||||
- name: Ensure the Wiki.js data directories exist
|
||||
ansible.builtin.file:
|
||||
path: "{{ item }}"
|
||||
@@ -25,9 +12,7 @@
|
||||
- "{{ content_dir }}"
|
||||
- "{{ uploads_dir }}"
|
||||
|
||||
# The app's database coordinates are consumed by systemd (EnvironmentFile= in the
|
||||
# Quadlet unit), not by Ansible, so this has to be written before the unit starts.
|
||||
# Mode 0600: DB_PASS carries the Postgres password.
|
||||
# Written before the unit starts; 0600 keeps the Postgres password from a world-readable unit.
|
||||
- name: Write the environment file
|
||||
ansible.builtin.template:
|
||||
src: wikijs.env.j2
|
||||
@@ -57,9 +42,7 @@
|
||||
state: started
|
||||
daemon_reload: true
|
||||
rescue:
|
||||
# systemd reports "control process exited with error code" and nothing else,
|
||||
# which is useless for the usual failures (an unattached network, an
|
||||
# unreachable database, a bad volume). Pull the real reason out.
|
||||
# systemd reports only a generic exit error, so collect the real reason.
|
||||
- name: Collect Wiki.js diagnostics
|
||||
ansible.builtin.command: "{{ item }}"
|
||||
loop:
|
||||
@@ -78,26 +61,15 @@
|
||||
ansible.builtin.fail:
|
||||
msg: "Wiki.js did not start — see the diagnostics above."
|
||||
|
||||
# Quadlet honours [Install] WantedBy= when it generates the unit, so
|
||||
# `systemctl --user enable` is neither needed nor possible on a generated unit.
|
||||
# Quadlet honours WantedBy=, so systemctl enable is neither needed nor possible on a generated unit.
|
||||
- name: Verify Wiki.js is running
|
||||
ansible.builtin.command: "systemctl --user is-active {{ unit_name }}"
|
||||
register: wikijs_active
|
||||
changed_when: false
|
||||
failed_when: wikijs_active.stdout != 'active'
|
||||
|
||||
# The database is the whole wiki, and it arrives over the network that
|
||||
# roles/postgres attached Postgres to. Check the name the environment file
|
||||
# actually asks for, plus the container name.
|
||||
#
|
||||
# This runs before the HTTP probe on purpose: an unresolvable database is the one
|
||||
# failure that would otherwise show up as two minutes of retries and a bare curl
|
||||
# error. It is also checked *before* the app is expected to answer, because the
|
||||
# network is attached when the container is created, not when the app is ready.
|
||||
#
|
||||
# getent is verified present in this image (/usr/bin/getent, via the musl
|
||||
# libc-utils package) and exits 2 with no output when the name does not resolve,
|
||||
# which is what the assert below keys off.
|
||||
# An unresolvable database would otherwise show up as two minutes of retries and a bare curl error.
|
||||
# getent exits 2 when the name does not resolve.
|
||||
- name: Confirm Wiki.js can resolve its database
|
||||
ansible.builtin.command: >-
|
||||
podman exec {{ container_name }} getent hosts {{ item }}
|
||||
@@ -123,16 +95,8 @@
|
||||
That means hiwikijs_net was never attached to the postgres unit — see
|
||||
roles/postgres and postgres/readme.md, "How services attach themselves".
|
||||
|
||||
# `is-active` says the container is running; it does not say the app can serve.
|
||||
# Wiki.js runs its own schema migrations against Postgres before it binds port
|
||||
# {{ container_port }}, and `Restart=always` means even a crash-looping container
|
||||
# is reported active.
|
||||
#
|
||||
# `podman healthcheck run` is not available here: the image declares no
|
||||
# HEALTHCHECK (verified — `docker inspect hiwikijs` reports null), unlike
|
||||
# Vaultwarden's. So probe HTTP directly with the image's own /usr/bin/curl; -f
|
||||
# turns the 4xx/5xx Wiki.js serves while the database is unreachable into a
|
||||
# failed retry instead of a success.
|
||||
# The image declares no HEALTHCHECK, so probe HTTP with its own curl.
|
||||
# -f turns the 4xx/5xx served while the database is unreachable into a failed retry.
|
||||
- name: Wait for Wiki.js to serve HTTP
|
||||
ansible.builtin.command: >-
|
||||
podman exec {{ container_name }}
|
||||
|
||||
Reference in new issue
Block a user