Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

l: move binary-cache config to 2

Browse Source
This commit is contained in:
lassulus 2016-06-25 18:56:39 +02:00
parent 9fd537b4d6
commit f6d5a9716f
4 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lass/1systems/prism.nix
View File

@ -20,6 +20,7 @@ in {
../2configs/radio.nix ../2configs/radio.nix
../2configs/buildbot-standalone.nix ../2configs/buildbot-standalone.nix
../2configs/repo-sync.nix ../2configs/repo-sync.nix
../2configs/binary-cache/server.nix
{ {
imports = [ imports = [
../2configs/git.nix ../2configs/git.nix
@ -211,30 +212,6 @@ in {
'') '')
]; ];
} }
{
services.nix-serve = {
enable = true;
secretKeyFile = config.krebs.secret.files.nix-serve-key.path;
};
systemd.services.nix-serve = {
requires = ["secret.service"];
after = ["secret.service"];
};
krebs.secret.files.nix-serve-key = {
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.prism.r" ];
locations = lib.singleton (lib.nameValuePair "/" ''
proxy_pass http://localhost:${toString config.services.nix-serve.port};
'');
};
};
}
]; ];
krebs.build.host = config.krebs.hosts.prism; krebs.build.host = config.krebs.hosts.prism;

9
lass/2configs/binary-cache/client.nix Normal file
View File

@ -0,0 +1,9 @@
{ config, ... }:
{
nix = {
binaryCaches = ["http://cache.prism.r"];
binaryCachePublicKeys = ["cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU="];
};
}

30
lass/2configs/binary-cache/server.nix Normal file
View File

@ -0,0 +1,30 @@
{ config, lib, pkgs, ...}:
{
# generate private key with:
# nix-store --generate-binary-cache-key my-secret-key my-public-key
services.nix-serve = {
enable = true;
secretKeyFile = config.krebs.secret.files.nix-serve-key.path;
};
systemd.services.nix-serve = {
requires = ["secret.service"];
after = ["secret.service"];
};
krebs.secret.files.nix-serve-key = {
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.prism.r" ];
locations = lib.singleton (lib.nameValuePair "/" ''
proxy_pass http://localhost:${toString config.services.nix-serve.port};
'');
};
};
}

7
lass/2configs/default.nix
View File

@ -8,6 +8,7 @@ with config.krebs.lib;
../2configs/mc.nix ../2configs/mc.nix
../2configs/retiolum.nix ../2configs/retiolum.nix
../2configs/nixpkgs.nix ../2configs/nixpkgs.nix
../2configs/binary-cache/client.nix
./backups.nix ./backups.nix
{ {
users.extraUsers = users.extraUsers =
@ -41,12 +42,6 @@ with config.krebs.lib;
}; };
}; };
} }
{
nix = {
binaryCaches = ["http://cache.prism.r"];
binaryCachePublicKeys = ["cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU="];
};
}
]; ];
networking.hostName = config.krebs.build.host.name; networking.hostName = config.krebs.build.host.name;