Move server7 cache URL to https://cache.server7.hq.c3d2.de
This commit is contained in:
parent
ffdecafac7
commit
608bfc282b
|
@ -32,7 +32,6 @@ let
|
||||||
|
|
||||||
cfg = config.c3d2;
|
cfg = config.c3d2;
|
||||||
|
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
|
||||||
imports = [ ./users ];
|
imports = [ ./users ];
|
||||||
|
@ -256,8 +255,7 @@ in {
|
||||||
|
|
||||||
nix = lib.mkIf
|
nix = lib.mkIf
|
||||||
(cfg.hq.enableBinaryCache && config.networking.hostName != "server7") {
|
(cfg.hq.enableBinaryCache && config.networking.hostName != "server7") {
|
||||||
binaryCaches =
|
binaryCaches = [ "https://cache.server7.hq.c3d2.de" ];
|
||||||
[ "http://server7.hq:${toString config.services.nix-serve.port}" ];
|
|
||||||
binaryCachePublicKeys = [
|
binaryCachePublicKeys = [
|
||||||
"cache.server7.hq.c3d2.de:x8JLRG26zRZ8ysYZLEkPxuAYuK1VSJi/aMAEIs2Lv+U="
|
"cache.server7.hq.c3d2.de:x8JLRG26zRZ8ysYZLEkPxuAYuK1VSJi/aMAEIs2Lv+U="
|
||||||
];
|
];
|
||||||
|
|
22
lib/hq.nix
22
lib/hq.nix
|
@ -1,25 +1,7 @@
|
||||||
{ config, lib, ... }:
|
{ 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!
|
# Please import only things that are configurable and OFF BY DEFAULT!
|
||||||
imports = [
|
imports = [ ./yggdrasil-hq.nix ];
|
||||||
./yggdrasil-hq.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue