c3d2/nix-config
c3d2
/
nix-config
24
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

Move server7 cache URL to https://cache.server7.hq.c3d2.de

This commit is contained in:
Ehmry - 2020-02-22 14:38:24 +01:00
parent ffdecafac7
commit 608bfc282b
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/default.nix
View File

@ -32,7 +32,6 @@ let
cfg = config.c3d2;
in {
imports = [ ./users ];
@ -256,8 +255,7 @@ in {
nix = lib.mkIf
(cfg.hq.enableBinaryCache && config.networking.hostName != "server7") {
binaryCaches =
[ "http://server7.hq:${toString config.services.nix-serve.port}" ];
binaryCaches = [ "https://cache.server7.hq.c3d2.de" ];
binaryCachePublicKeys = [
"cache.server7.hq.c3d2.de:x8JLRG26zRZ8ysYZLEkPxuAYuK1VSJi/aMAEIs2Lv+U="
];

22
lib/hq.nix
View File

@ -1,25 +1,7 @@
{ config, lib, ... }:
let
notHydra = config.networking.hostName != "hydra";
notServer7 = config.networking.hostName != "server7";
port = toString config.services.nix-serve.port;
in {
nix = {
binaryCaches = [ ]
++ (lib.optional notHydra "https://nix-serve.hq.c3d2.de")
++ (lib.optional notServer7 "http://server7.hq.c3d2.de:${port}");
binaryCachePublicKeys = [
"nix-serve.hq.c3d2.de:FEi9GyFkou1Ua8INaEKmuGaww9E5y3XwrNGNRfKYeLo="
"server7:PxMuG2KvTibHSqOWi+6bY6fbv2ztjzbSEZHVIna/sRA="
];
};
{
# Please import only things that are configurable and OFF BY DEFAULT!
imports = [
./yggdrasil-hq.nix
];
imports = [ ./yggdrasil-hq.nix ];
}