diff options
Diffstat (limited to 'tv')
-rw-r--r-- | tv/1systems/nomic.nix | 1 | ||||
-rw-r--r-- | tv/1systems/wu.nix | 1 | ||||
-rw-r--r-- | tv/1systems/xu.nix | 2 | ||||
-rw-r--r-- | tv/1systems/zu.nix | 1 | ||||
-rw-r--r-- | tv/2configs/binary-cache/default.nix (renamed from tv/2configs/wu-binary-cache/default.nix) | 16 | ||||
-rw-r--r-- | tv/2configs/wu-binary-cache/client.nix | 7 |
6 files changed, 13 insertions, 15 deletions
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix index 6669b5d..7d6a1d6 100644 --- a/tv/1systems/nomic.nix +++ b/tv/1systems/nomic.nix @@ -15,7 +15,6 @@ with import <stockholm/lib>; ../2configs/nginx/public_html.nix ../2configs/pulse.nix ../2configs/retiolum.nix - ../2configs/wu-binary-cache/client.nix ../2configs/xserver ]; diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 19db559..d5be57b 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -16,7 +16,6 @@ with import <stockholm/lib>; ../2configs/nginx/public_html.nix ../2configs/pulse.nix ../2configs/retiolum.nix - ../2configs/wu-binary-cache ../2configs/xserver { environment.systemPackages = with pkgs; [ diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix index a7e0b83..b6fe6dc 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -15,7 +15,7 @@ with import <stockholm/lib>; ../2configs/nginx/public_html.nix ../2configs/pulse.nix ../2configs/retiolum.nix - ../2configs/wu-binary-cache/client.nix + ../2configs/binary-cache ../2configs/xserver ../2configs/xu-qemu0.nix { diff --git a/tv/1systems/zu.nix b/tv/1systems/zu.nix index 056652e..59e8b1c 100644 --- a/tv/1systems/zu.nix +++ b/tv/1systems/zu.nix @@ -21,7 +21,6 @@ with import <stockholm/lib>; ../2configs/nginx/public_html.nix ../2configs/pulse.nix ../2configs/retiolum.nix - ../2configs/wu-binary-cache/client.nix ../2configs/xserver { environment.systemPackages = with pkgs; [ diff --git a/tv/2configs/wu-binary-cache/default.nix b/tv/2configs/binary-cache/default.nix index f039a55..5902f18 100644 --- a/tv/2configs/wu-binary-cache/default.nix +++ b/tv/2configs/binary-cache/default.nix @@ -1,22 +1,30 @@ { config, lib, pkgs, ... }: with import <stockholm/lib>; { - services.nix-serve = assert config.krebs.build.host.name == "wu"; { + environment.etc."binary-cache.pubkey".text = + config.krebs.build.host.binary-cache.pubkey; + + services.nix-serve = { enable = true; - secretKeyFile = config.krebs.secret.files.nix-serve-key.path; + secretKeyFile = config.krebs.secret.files.binary-cache-seckey.path; }; + systemd.services.nix-serve = { requires = ["secret.service"]; after = ["secret.service"]; }; - krebs.secret.files.nix-serve-key = { + + krebs.secret.files.binary-cache-seckey = { path = "/run/secret/nix-serve.key"; owner.name = "nix-serve"; source-path = toString <secrets> + "/nix-serve.key"; }; + krebs.nginx = { enable = true; servers.nix-serve = { - server-names = [ "cache.wu.gg23" ]; + server-names = [ + "cache.${config.krebs.build.host.name}.gg23" + ]; locations = singleton (nameValuePair "/" '' proxy_pass http://localhost:${toString config.services.nix-serve.port}; ''); diff --git a/tv/2configs/wu-binary-cache/client.nix b/tv/2configs/wu-binary-cache/client.nix deleted file mode 100644 index 9634c21..0000000 --- a/tv/2configs/wu-binary-cache/client.nix +++ /dev/null @@ -1,7 +0,0 @@ -_: -{ - nix = { - binaryCaches = ["http://cache.wu.gg23"]; - binaryCachePublicKeys = ["cache.wu-1:cdhA201O2R2Ect463vhJFmhpMaNyT/tOvzYvtceT9q8="]; - }; -} |