Compare commits

...

2 Commits

Author SHA1 Message Date
Ehmry - 2fc4716870 server7: remove missing collectd plugins
Something happened to collectd between 19.09 and 20.03
2020-04-24 10:14:37 +02:00
Ehmry - 9b5b7432ca server7: update hydra revision 2020-04-24 10:14:08 +02:00
3 changed files with 31 additions and 13 deletions

View File

@ -2,8 +2,8 @@
"nodes": { "nodes": {
"hydra": { "hydra": {
"info": { "info": {
"lastModified": 1586949285, "lastModified": 1587633099,
"narHash": "sha256-mXvLmicI1XtturvkuBbt1Fe4MsiGlbbK8Qlg8pyIyY4=" "narHash": "sha256-cOsYakp2nJgRY0cP6YNBLV4srP19v6XQEZM7EefS3Kw="
}, },
"inputs": { "inputs": {
"nix": "nix", "nix": "nix",
@ -12,7 +12,7 @@
"locked": { "locked": {
"owner": "ehmry", "owner": "ehmry",
"repo": "hydra", "repo": "hydra",
"rev": "59bb3ab8e854cb52782077f2c5a80471d0004ac8", "rev": "e1ae3bd9a4bdaac8ff6878febf2c64fee12544f2",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -84,6 +84,11 @@ in {
} }
''; '';
}; };
nixpkgs.overlays = [
(self: super: {
nix = super.nix // { meta.platforms = lib.platforms.linux; };
})
];
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
@ -125,16 +130,11 @@ in {
]; ];
services.collectd.extraConfig = '' services.collectd.extraConfig = ''
LoadPlugin sensors
LoadPlugin memory LoadPlugin memory
LoadPlugin irq
LoadPlugin thermal
LoadPlugin processes LoadPlugin processes
LoadPlugin disk LoadPlugin disk
LoadPlugin hddtemp
LoadPlugin df LoadPlugin df
LoadPlugin cpu LoadPlugin cpu
LoadPlugin cpufreq
LoadPlugin entropy LoadPlugin entropy
LoadPlugin load LoadPlugin load
LoadPlugin swap LoadPlugin swap

View File

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
services.hydra-dev = { services.hydra-dev = {
@ -11,11 +11,13 @@
# package = pkgs.hydra-unstable; # package = pkgs.hydra-unstable;
listenHost = "172.22.99.245"; listenHost = "172.22.99.245";
# listenHost = "*"; # listenHost = "*";
useSubstitutes = true;
minimumDiskFree = 2;
minimumDiskFreeEvaluator = 2;
extraConfig = '' extraConfig = ''
<sotest> <sotest>
username = emery authfile = /var/lib/hydra/sotest.auth
password = 36\#KAVMD </sotest>
</sotest>
''; '';
}; };
@ -28,4 +30,20 @@
maxJobs = 8; 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";
};
};
};
} }