make .onion domains declarative, site updates, add helpers

services/akkoma.nix

@@ -1,8 +1,13 @@
-{pkgs, ...}: let
+{
+  pkgs,
+  config,
+  ...
+}: let
   fediPort = 8083;
-  onionUrl = "http://n5j5sq55iem2hzbgvkba5vwd5gx5qj2pkb7nxyginbtmnkah74rtulad.onion";
   inherit ((pkgs.formats.elixirConf {}).lib) mkAtom;
 in {
+  age.secrets."hidden_service/akkoma".file = ../secrets/hidden_service/akkoma;
+
   services = {
     akkoma = {
       enable = true;
@@ -35,14 +40,16 @@ in {
         };
       };
     };
+  };
 
-    caddy.virtualHosts."https://social.distrust.network ${onionUrl}".extraConfig = ''
+  distrust.services."akkoma" = {
+    url = "https://social.distrust.network";
+    onion = {
+      url = "http://n5j5sq55iem2hzbgvkba5vwd5gx5qj2pkb7nxyginbtmnkah74rtulad.onion";
+      secretKey = config.age.secrets."hidden_service/akkoma".path;
+    };
+    virtualHostConfig = ''
       reverse_proxy localhost:${toString fediPort}
-      header Onion-Loction ${onionUrl}
     '';
-
-    tor.relay.onionServices."akkoma".map = [
-      80
-    ];
   };
 }