From 707c6b640dca086634581220614c6094ebbcccbf Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 15 Sep 2022 20:35:43 +0200
Subject: tv binary-cache: use nix-serve-ng

---
 tv/2configs/binary-cache/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'tv/2configs/binary-cache/default.nix')

diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix
index f6eaba36..e5342cd5 100644
--- a/tv/2configs/binary-cache/default.nix
+++ b/tv/2configs/binary-cache/default.nix
@@ -3,6 +3,12 @@
   environment.etc."binary-cache.pubkey".text =
     config.krebs.build.host.binary-cache.pubkey;
 
+  nixpkgs.overlays = [
+    (self: super: {
+      nix-serve = self.haskellPackages.nix-serve-ng;
+    })
+  ];
+
   services.nix-serve = {
     enable = true;
     secretKeyFile = config.krebs.secret.files.binary-cache-seckey.path;
-- 
cgit v1.2.3


From 3e6f01c3003558a7db1094742fc2cbedf985cd23 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 15 Sep 2022 20:51:27 +0200
Subject: tv binary-cache: drop krebs.secert

---
 tv/2configs/binary-cache/default.nix | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'tv/2configs/binary-cache/default.nix')

diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix
index e5342cd5..6ef7a385 100644
--- a/tv/2configs/binary-cache/default.nix
+++ b/tv/2configs/binary-cache/default.nix
@@ -11,22 +11,7 @@
 
   services.nix-serve = {
     enable = true;
-    secretKeyFile = config.krebs.secret.files.binary-cache-seckey.path;
-  };
-
-  systemd.services.nix-serve = {
-    after = [
-      config.krebs.secret.files.binary-cache-seckey.service
-    ];
-    partOf = [
-      config.krebs.secret.files.binary-cache-seckey.service
-    ];
-  };
-
-  krebs.secret.files.binary-cache-seckey = {
-    path = "/run/secret/nix-serve.key";
-    owner.name = "nix-serve";
-    source-path = toString <secrets> + "/nix-serve.key";
+    secretKeyFile = toString <secrets> + "/nix-serve.key";
   };
 
   services.nginx = {
-- 
cgit v1.2.3


From d76cf33d1f000389558da8c8f5e17db966b8a5a7 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 15 Sep 2022 20:52:00 +0200
Subject: tv binary-cache: add retiolum alias

---
 tv/2configs/binary-cache/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tv/2configs/binary-cache/default.nix')

diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix
index 6ef7a385..58791f4f 100644
--- a/tv/2configs/binary-cache/default.nix
+++ b/tv/2configs/binary-cache/default.nix
@@ -19,6 +19,7 @@
     virtualHosts.nix-serve = {
       serverAliases = [
         "cache.${config.krebs.build.host.name}.hkw"
+        "cache.${config.krebs.build.host.name}.r"
       ];
       locations."/".extraConfig = ''
         proxy_pass http://localhost:${toString config.services.nix-serve.port};
-- 
cgit v1.2.3