Merge remote-tracking branch 'origin/master' into feat/mars-hermes-mnemosyne

# Conflicts:
#	README.md
#	hosts/jupiter/secrets.nix
#	services/dev/gitea-hermes-webhook-relay.nix
#	services/dev/gitea.nix

hosts/jupiter/secrets.nix

@@ -1,14 +1,8 @@
 { config, ... }:
 
-# sops-nix secret wiring (real host only; not imported by vm.nix).
-# Encrypted values live in ../../secrets/jupiter.yaml, decrypted at activation to
-# /run/secrets/<name>.
-#
-# The host decrypts with its OWN SSH host key (age identity derived via
-# ssh-to-age, recipient listed in ../../.sops.yaml). The key is pre-generated on
-# the laptop and shipped once at install as /etc/ssh/ssh_host_ed25519_key
-# (nixos-anywhere --extra-files) — so decryption works on boot #1 and there is
-# no separate sops-only key to manage.
+# sops-nix secret wiring (real host only; not imported by vm.nix). Decrypts with the
+# host's own SSH host key (ssh-to-age), shipped once at install via nixos-anywhere
+# --extra-files, so there's no separate sops-only key to manage.
 {
   sops.defaultSopsFile = ../../secrets/jupiter.yaml;
   sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
@@ -26,18 +20,14 @@
   # Headscale pre-auth key for tailscale auto-registration (see configuration.nix).
   sops.secrets.tailscale_authkey = { };
 
-  # Immich's OIDC client secret, from its Authentik application (a SEPARATE
-  # app from headscale's and headplane's — see hosts/neptun/secrets.nix).
-  # Referenced as settings.oauth.clientSecret._secret in
-  # services/media/immich.nix; the module resolves it through systemd
-  # LoadCredential, which reads as root before dropping privileges, so the
-  # sops default of root:root 0400 is correct — do NOT set `owner`.
+  # Immich's OIDC client secret (separate Authentik app from headscale/headplane, see
+  # hosts/neptun/secrets.nix). Resolved via systemd LoadCredential as root before
+  # privilege drop, so sops's default root:root 0400 is correct — do NOT set `owner`.
   sops.secrets.immich_oauth_client_secret = { };
 
-  # Gitea Actions runner registration token (services/dev/gitea.nix). Gitea
-  # generates this itself once Actions is enabled — it is not a password
-  # chosen up front. Rendered into a `TOKEN=...` env file because
-  # gitea-actions-runner takes an EnvironmentFile, not a raw secret path.
+  # Gitea Actions runner registration token — gitea generates this itself once Actions
+  # is enabled. Rendered into an env file since gitea-actions-runner takes an
+  # EnvironmentFile, not a raw secret path.
   sops.secrets.gitea_runner_token = { };
   sops.templates."gitea-runner.env".content =
     "TOKEN=${config.sops.placeholder.gitea_runner_token}";
@@ -48,6 +38,11 @@
   # ci-bot access token to allow the ci-bot user to push to repos
   sops.secrets.gitea_ci_bot_token.owner = "gitea";
 
+  # Add the same value to secrets/jupiter.yaml before deploying Jupiter.
+  sops.secrets.gitea_hermes_webhook_secret = {
+    owner = "gitea";
+  };
+
   # SABnzbd credentials (web UI login, API keys, eweka.nl usenet server) —
   # migrated off the reused ini in services/media/sabnzbd.nix into
   # services.sabnzbd.settings + secretValues. sabnzbd_api_key predates this
@@ -64,4 +59,18 @@
   sops.secrets.sabnzbd_eweka_username.owner = "sabnzbd";
   sops.secrets.sabnzbd_eweka_password.owner = "sabnzbd";
 
+  # CouchDB admin account for Obsidian LiveSync — rendered into an [admins] ini
+  # fragment instead of services.couchdb.adminPass, which would put the plaintext in
+  # the world-readable store.
+  # owner = couchdb on both: couchdb re-reads the ini as its own user after privilege
+  # drop, and without this sops's default root:root 0400 leaves it with no admin
+  # configured (every request 401s).
+  sops.secrets.couchdb_admin_password.owner = "couchdb";
+  sops.templates."couchdb-admins.ini" = {
+    owner = "couchdb";
+    content = ''
+      [admins]
+      obsidian = ${config.sops.placeholder.couchdb_admin_password}
+    '';
+  };
 }