diff options
author | makefu <github@syntax-fehler.de> | 2022-09-23 22:25:15 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2022-09-23 22:25:15 +0200 |
commit | 57eceb7c056f90da0bc107e73795967e76ad92bf (patch) | |
tree | 7087e89c115ff4a97f74ca629d5e59e740b04b25 /tv/2configs/binary-cache/default.nix | |
parent | 092e42f7370b604ba05eda9b3ab1e07c91541d9a (diff) | |
parent | 55957c6d6adb51d2079c117c1e7309c60ee0fe0f (diff) |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/2configs/binary-cache/default.nix')
-rw-r--r-- | tv/2configs/binary-cache/default.nix | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix index f6eaba36f..58791f4f6 100644 --- a/tv/2configs/binary-cache/default.nix +++ b/tv/2configs/binary-cache/default.nix @@ -3,24 +3,15 @@ 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; - }; - - 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 = { @@ -28,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}; |