caddy files

Flake lock file updates:

• Updated input 'secrets':
    'git+ssh://git@git.caspervk.net/caspervk/nixos-secrets.git?ref=refs/heads/master&rev=84f9be99ee397303cb23dfc8713115088fa7a53d' (2024-04-23)
  → 'git+ssh://git@git.caspervk.net/caspervk/nixos-secrets.git?ref=refs/heads/master&rev=d73392f1e37da591bbc2700a37beba60c5bc4648' (2024-04-24)

flake.lock

@@ -165,11 +165,11 @@
     },
     "secrets": {
       "locked": {
-        "lastModified": 1713906026,
-        "narHash": "sha256-pI2SocGL1Ev54UXizRL2L6t3UmBFVGGmcSgBmthSeJU=",
+        "lastModified": 1713917034,
+        "narHash": "sha256-TcRTcrx6Y+qZpoOvCu+DNyHWGFOFxL4bDMCD2EvYNsg=",
         "ref": "refs/heads/master",
-        "rev": "84f9be99ee397303cb23dfc8713115088fa7a53d",
-        "revCount": 23,
+        "rev": "d73392f1e37da591bbc2700a37beba60c5bc4648",
+        "revCount": 25,
         "type": "git",
         "url": "ssh://git@git.caspervk.net/caspervk/nixos-secrets.git"
       },

hosts/alpha/acme.nix

@@ -1,5 +1,6 @@
 {lib, ...}: {
-  security.acme.certs."caspervk.net" = {
+  security.acme.certs = {
+    "caspervk.net" = {
       domain = "*.caspervk.net";
       reloadServices = [
         "caddy.service"
@@ -10,6 +11,7 @@
       # since we handle the group membership manually.
       group = lib.mkForce "acme";
     };
+  };
   users.groups.acme.members = [
     "caddy"
     "murmur"

hosts/delta/acme.nix

@@ -1,11 +1,13 @@
 {...}: {
-  security.acme.certs."caspervk.net" = {
+  security.acme.certs = {
+    "caspervk.net" = {
       domain = "*.caspervk.net";
       reloadServices = [
         "kresd@1.service"
         "kresd@2.service"
       ];
     };
+  };
   users.groups.acme.members = [
     "knot-resolver"
   ];

hosts/sigma/acme.nix

@@ -1,5 +1,6 @@
 {lib, ...}: {
-  security.acme.certs."caspervk.net" = {
+  security.acme.certs = {
+    "caspervk.net" = {
       domain = "*.caspervk.net";
       reloadServices = [
         "caddy.service"
@@ -9,6 +10,13 @@
       # since we handle the group membership manually.
       group = lib.mkForce "acme";
     };
+    "sudomail.org" = {
+      reloadServices = [
+        "caddy.service"
+      ];
+      group = lib.mkForce "acme";
+    };
+  };
   users.groups.acme.members = [
     "caddy"
   ];

modules/server/caddy.nix

@@ -20,7 +20,7 @@ lib.mkIf (config.services.caddy.virtualHosts != {}) {
   environment.persistence."/nix/persist" = {
     directories = [
       {
-        directory = "/var/lib/caddy";
+        directory = "/var/www/html";
         user = "caddy";
         group = "caddy";
         mode = "0755";