diff --git a/flake.lock b/flake.lock
index 019f9a2a..93b03c3d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,8 +2,8 @@
"nodes": {
"hydra": {
"info": {
- "lastModified": 1586949285,
- "narHash": "sha256-mXvLmicI1XtturvkuBbt1Fe4MsiGlbbK8Qlg8pyIyY4="
+ "lastModified": 1587633099,
+ "narHash": "sha256-cOsYakp2nJgRY0cP6YNBLV4srP19v6XQEZM7EefS3Kw="
},
"inputs": {
"nix": "nix",
@@ -12,7 +12,7 @@
"locked": {
"owner": "ehmry",
"repo": "hydra",
- "rev": "59bb3ab8e854cb52782077f2c5a80471d0004ac8",
+ "rev": "e1ae3bd9a4bdaac8ff6878febf2c64fee12544f2",
"type": "github"
},
"original": {
diff --git a/hosts/server7/default.nix b/hosts/server7/default.nix
index 84e06653..05a07eb2 100644
--- a/hosts/server7/default.nix
+++ b/hosts/server7/default.nix
@@ -84,6 +84,11 @@ in {
}
'';
};
+ nixpkgs.overlays = [
+ (self: super: {
+ nix = super.nix // { meta.platforms = lib.platforms.linux; };
+ })
+ ];
virtualisation.docker.enable = true;
diff --git a/hosts/server7/hydra.nix b/hosts/server7/hydra.nix
index f0b68f5a..52692b0e 100644
--- a/hosts/server7/hydra.nix
+++ b/hosts/server7/hydra.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
{
services.hydra-dev = {
@@ -11,11 +11,13 @@
# package = pkgs.hydra-unstable;
listenHost = "172.22.99.245";
# listenHost = "*";
+ useSubstitutes = true;
+ minimumDiskFree = 2;
+ minimumDiskFreeEvaluator = 2;
extraConfig = ''
-
- username = emery
- password = 36\#KAVMD
-
+
+ authfile = /var/lib/hydra/sotest.auth
+
'';
};
@@ -28,4 +30,20 @@
maxJobs = 8;
}];
+ nix.binaryCachePublicKeys =
+ [ "nix-serve.hq.c3d2.de-2:elqZouiiQP4XNfmEekwXH/YRPL1pXlN5JgVSzT1Ctoc=" ];
+ nix.binaryCaches = [ "http://nix-serve.hq.c3d2.de" ];
+
+ services.nginx = {
+ enable = true;
+ virtualHosts = {
+ "server7.hq.c3d2.de" = {
+ addSSL = true;
+ enableACME = true;
+ globalRedirect = "hydra7.hq.c3d2.de";
+ };
+ };
+ };
+
+
}