controld: replace agh everywhere

agenix/hosts/argon/config.nix

@@ -10,14 +10,15 @@
       group = "acme";
     };
 
-    cfdyndns-api-token = {
-      file = ./cfdyndns/apiToken.age;
-    };
-
     tailscale-authkey = {
       file = ./tailscale/authkey.age;
     };
 
+    controld-config = {
+      file = ./controld/config.age;
+      path = "/var/lib/controld/ctrld.toml";
+    };
+
     adguardhome-sync-environment = {
       file = ./adguardhome-sync/environment.age;
     };

agenix/hosts/mediaserver/config.nix

@@ -22,6 +22,11 @@
       file = ./wireguard/config.age;
     };
 
+    controld-config = {
+      file = ./controld/config.age;
+      path = "/var/lib/controld/ctrld.toml";
+    };
+
     tubearchivist-environment-ta = {
       file = ./tubearchivist/environmentTA.age;
     };

secrets.nix

@@ -77,6 +77,8 @@ in
 
   "agenix/hosts/mediaserver/wireguard/config.age".publicKeys = mediaserver;
 
+  "agenix/hosts/mediaserver/controld/config.age".publicKeys = mediaserver;
+
   "agenix/hosts/mediaserver/tubearchivist/environmentTA.age".publicKeys = mediaserver;
 
   "agenix/hosts/mediaserver/tubearchivist/environmentES.age".publicKeys = mediaserver;
@@ -94,6 +96,8 @@ in
 
   "agenix/hosts/argon/cfdyndns/apiToken.age".publicKeys = argon;
 
+  "agenix/hosts/argon/controld/config.age".publicKeys = argon;
+
   "agenix/hosts/argon/forgejo-actions/token.age".publicKeys = argon;
 
   "agenix/hosts/argon/tailscale/authkey.age".publicKeys = argon;

system/hosts/argon.nix

@@ -19,13 +19,12 @@ in
     ../nixos/nginx.nix
     ../nixos/nginx-argon.nix
 
-    (import ../nixos/adguardhome.nix (args // { inherit secret; }))
-    #(import ../nixos/cfdyndns.nix (args // { inherit secret; }))
-
     ../nixos/attic.nix
 
     ../nixos/chrony.nix
 
+    (import ../nixos/controld.nix (args // { podmanDNS = false; }))
+
     (import ../nixos/forgejo-runner.nix (args // { inherit secret; name = "argon"; tag = "ubuntu-latest-arm64"; nixTag = "arm64"; }))
 
     ../nixos/tailscale-router.nix
@@ -38,7 +37,6 @@ in
     ../nixos/weewx-proxy.nix
 
     ../nixos/container.nix
-    ../nixos/adguardhome-sync.nix
     ../nixos/homebridge.nix
   ];
 

system/hosts/mediaserver.nix

@@ -19,10 +19,10 @@ in
     ../nixos/nginx-mediaserver.nix
     ../nixos/postgresql.nix
 
-    (import ../nixos/adguardhome.nix (args // { inherit secret; }))
-
     ../nixos/attic.nix
 
+    (import ../nixos/controld.nix (args // { podmanDNS = true; }))
+
     ../nixos/ddg.nix
 
     ../nixos/tailscale-router.nix

system/nixos/controld.nix

@@ -7,7 +7,7 @@
       startLimitIntervalSec = 5;
       startLimitBurst = 10;
       serviceConfig = {
-        ExecStart = "${pkgs.controld}/bin/ctrld run -vvvv";
+        ExecStart = "${pkgs.controld}/bin/ctrld run";
         WorkingDirectory = "/var/lib/controld";
         RestartSec = 120;
         LimitMEMLOCK = "infinity";