all repos — nixfiles @ 1f0b124cdb532d6de22843c2ca731b72ee1c02b3

System and user configuration, managed by nix and home-manager

extract binary cache role

Alin
commit

1f0b124cdb532d6de22843c2ca731b72ee1c02b3

parent

78db0c79f0e4b37ce16b5c468b52526dab2e2e31

2 files changed, 24 insertions(+), 16 deletions(-)

changed files
M system/hosts/linde.nix → system/hosts/linde.nix
@@ -32,6 +32,7 @@ ./linde-hardware.nix
 
     ../roles/server.nix
     ../roles/reverse-proxy.nix
+    ../roles/binary-cache.nix
     ../settings/services/git-server.nix
   ];
   age.secrets = {

@@ -46,7 +47,6 @@ owner = cfg.user;
         mode = "400";
         symlink = false;
       };
-    binarycache.file = ../../secrets/binarycache.age;
     powerdns.file = ../../secrets/powerdns.age;
     redis-website.file = ../../secrets/redis-website.age;
     cifs-jellyfin.file = ../../secrets/cifs-jellyfin.age;

@@ -133,12 +133,6 @@ dates = "02:10";
     randomizedDelaySec = "59 min";
     allowReboot = true;
     flake = "${config.systemd.services.update-nixfiles.serviceConfig.WorkingDirectory}?submodules=1";
-  };
-
-  services.nix-serve = {
-    enable = true;
-    package = pkgs.nix-serve-ng;
-    secretKeyFile = config.age.secrets.binarycache.path;
   };
 
   networking = {

@@ -588,15 +582,6 @@ }
             }
           '';
         };
-        "binarycache.${domain}" =
-          let
-            ns = config.services.nix-serve;
-          in
-          {
-            extraConfig = ''
-              reverse_proxy ${ns.bindAddress}:${toString ns.port}
-            '';
-          };
         "ci.${domain}" =
           let
             srv = config.services.laminar;
A system/roles/binary-cache.nix
@@ -0,0 +1,23 @@
+{
+  config,
+  pkgs,
+  ...
+}:
+let
+  ns = config.services.nix-serve;
+in
+{
+  age.secrets.binarycache.file = ../../secrets/binarycache.age;
+
+  services.nix-serve = {
+    enable = true;
+    package = pkgs.nix-serve-ng;
+    secretKeyFile = config.age.secrets.binarycache.path;
+  };
+
+  services.caddy.virtualHosts."binarycache.${config.networking.domain}" = {
+    extraConfig = ''
+      reverse_proxy ${ns.bindAddress}:${toString ns.port}
+    '';
+  };
+}