Merge branch 'master' of git.uninsane.org:shelvacu/nix-stuff

common/default.nix

@@ -31,7 +31,7 @@ else
       ./defaultPackages.nix
       ./lib
       ./sops.nix
-      ./dns
+      ../dns
       ./assertions.nix
       ./common-but-not.nix
       ./nixos.nix

flake.lock

@@ -669,11 +669,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739619820,
-        "narHash": "sha256-GSMtQyBLXWZ83Aizn6/TNP/tVA1Uw2aH914eLc3KFB4=",
+        "lastModified": 1740049936,
+        "narHash": "sha256-vlMgJ0bNmAlhb9vSXiWmHSFESjRG7C4kJv5CCz+BYCg=",
         "owner": "captain-jean-luc",
         "repo": "most-winningest",
-        "rev": "90dc4f50c22bc01c664594a9b6b5d4365d858410",
+        "rev": "fe0229e967ad1cbb92a92d4650ac136ba6e6a5b5",
         "type": "github"
       },
       "original": {

triple-dezert/proxied/services/static-stuff.nix

@@ -1,17 +1,22 @@
 {
   ...
 }:
+let
+  proxiedCommon = {
+    fromContainer = "static-stuff";
+    port = 80;
+  };
+in
 {
   vacu.proxiedServices.static-stuff-tulpaudcast = {
     domain = "tulpaudcast.jean-luc.org";
-    fromContainer = "static-stuff";
-    port = 80;
-  };
+  } // proxiedCommon;
   vacu.proxiedServices.static-stuff-mira = {
     domain = "shelvacu.miras.pet";
-    fromContainer = "static-stuff";
-    port = 80;
-  };
+  } // proxiedCommon;
+  vacu.proxiedServices.static-stuff-gab = {
+    domain = "gabriel-dropout.for.miras.pet";
+  } // proxiedCommon;
 
   systemd.tmpfiles.settings.asdf."/trip/static-stuff".d = {
     mode = "0744";
@@ -37,12 +42,14 @@
       systemd.tmpfiles.settings."asdf"."/static-stuff"."Z".mode = "0555";
       
       services.nginx.enable = true;
-      services.nginx.virtualHosts."tulpaudcast.jean-luc.org".root =
-        "/static-stuff/tulpaudcast.jean-luc.org";
-      services.nginx.virtualHosts."shelvcu.miras.pet".extraConfig = ''
-        default_type text/plain;
-        return 200 "I don't know what to put here";
-      '';
+      services.nginx.virtualHosts = {
+        "tulpaudcast.jean-luc.org".root = "/static-stuff/tulpaudcast.jean-luc.org";
+        "shelvacu.miras.pet".extraConfig = ''
+          default_type text/plain;
+          return 200 "I don't know what to put here";
+        '';
+        "gabriel-dropout.for.miras.pet".root = "/static-stuff/gabriel-dropout.for.miras.pet";
+      };
     };
   };
 }