From 5370e0485788224126861e076110ac705013d2de Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 11 Sep 2023 15:31:13 +0200
Subject: treewide: don't reference <secrets> explicitly

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

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

diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix
index 66d740715..5b4e75107 100644
--- a/tv/2configs/binary-cache/default.nix
+++ b/tv/2configs/binary-cache/default.nix
@@ -11,7 +11,7 @@
 
   services.nix-serve = {
     enable = true;
-    secretKeyFile = toString <secrets> + "/nix-serve.key";
+    secretKeyFile = "${config.krebs.secret.directory}/nix-serve.key";
   };
 
   services.nginx = {
-- 
cgit v1.2.3


From fbd485cd86c7e9984819357398f912a2d5510845 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 12 Sep 2023 12:56:39 +0200
Subject: tv: emigrate

---
 tv/2configs/binary-cache/default.nix | 29 -----------------------------
 tv/2configs/binary-cache/lib         |  1 -
 2 files changed, 30 deletions(-)
 delete mode 100644 tv/2configs/binary-cache/default.nix
 delete mode 120000 tv/2configs/binary-cache/lib

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

diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix
deleted file mode 100644
index 5b4e75107..000000000
--- a/tv/2configs/binary-cache/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ config, lib, pkgs, ... }: with import ./lib;
-{
-  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.directory}/nix-serve.key";
-  };
-
-  services.nginx = {
-    enable = true;
-    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};
-      '';
-    };
-  };
-}
diff --git a/tv/2configs/binary-cache/lib b/tv/2configs/binary-cache/lib
deleted file mode 120000
index dc598c56d..000000000
--- a/tv/2configs/binary-cache/lib
+++ /dev/null
@@ -1 +0,0 @@
-../lib
\ No newline at end of file
-- 
cgit v1.2.3