diff options
Diffstat (limited to 'tv/2configs')
-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 |
2 files changed, 12 insertions, 11 deletions
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="]; - }; -} |