2 Commits

Author SHA1 Message Date
  Emery Hemingway 2fc4716870 server7: remove missing collectd plugins 5 months ago
  Emery Hemingway 9b5b7432ca server7: update hydra revision 5 months ago
3 changed files with 31 additions and 13 deletions
  1. 3
    3
      flake.lock
  2. 5
    5
      hosts/server7/default.nix
  3. 23
    5
      hosts/server7/hydra.nix

+ 3
- 3
flake.lock View File

@@ -2,8 +2,8 @@
2 2
   "nodes": {
3 3
     "hydra": {
4 4
       "info": {
5
-        "lastModified": 1586949285,
6
-        "narHash": "sha256-mXvLmicI1XtturvkuBbt1Fe4MsiGlbbK8Qlg8pyIyY4="
5
+        "lastModified": 1587633099,
6
+        "narHash": "sha256-cOsYakp2nJgRY0cP6YNBLV4srP19v6XQEZM7EefS3Kw="
7 7
       },
8 8
       "inputs": {
9 9
         "nix": "nix",
@@ -12,7 +12,7 @@
12 12
       "locked": {
13 13
         "owner": "ehmry",
14 14
         "repo": "hydra",
15
-        "rev": "59bb3ab8e854cb52782077f2c5a80471d0004ac8",
15
+        "rev": "e1ae3bd9a4bdaac8ff6878febf2c64fee12544f2",
16 16
         "type": "github"
17 17
       },
18 18
       "original": {

+ 5
- 5
hosts/server7/default.nix View File

@@ -84,6 +84,11 @@ in {
84 84
       }
85 85
     '';
86 86
   };
87
+  nixpkgs.overlays = [
88
+    (self: super: {
89
+      nix = super.nix // { meta.platforms = lib.platforms.linux; };
90
+    })
91
+  ];
87 92
 
88 93
   virtualisation.docker.enable = true;
89 94
 
@@ -125,16 +130,11 @@ in {
125 130
   ];
126 131
 
127 132
   services.collectd.extraConfig = ''
128
-    LoadPlugin sensors
129 133
     LoadPlugin memory
130
-    LoadPlugin irq
131
-    LoadPlugin thermal
132 134
     LoadPlugin processes
133 135
     LoadPlugin disk
134
-    LoadPlugin hddtemp
135 136
     LoadPlugin df
136 137
     LoadPlugin cpu
137
-    LoadPlugin cpufreq
138 138
     LoadPlugin entropy
139 139
     LoadPlugin load
140 140
     LoadPlugin swap

+ 23
- 5
hosts/server7/hydra.nix View File

@@ -1,4 +1,4 @@
1
-{ config, pkgs, ... }:
1
+{ config, lib, pkgs, ... }:
2 2
 
3 3
 {
4 4
   services.hydra-dev = {
@@ -11,11 +11,13 @@
11 11
     # package = pkgs.hydra-unstable;
12 12
     listenHost = "172.22.99.245";
13 13
     # listenHost = "*";
14
+    useSubstitutes = true;
15
+    minimumDiskFree = 2;
16
+    minimumDiskFreeEvaluator = 2;
14 17
     extraConfig = ''
15
-    <sotest>
16
-    username = emery
17
-    password = 36\#KAVMD
18
-    </sotest>
18
+      <sotest>
19
+      authfile = /var/lib/hydra/sotest.auth
20
+      </sotest>
19 21
     '';
20 22
   };
21 23
 
@@ -28,4 +30,20 @@
28 30
     maxJobs = 8;
29 31
   }];
30 32
 
33
+  nix.binaryCachePublicKeys =
34
+    [ "nix-serve.hq.c3d2.de-2:elqZouiiQP4XNfmEekwXH/YRPL1pXlN5JgVSzT1Ctoc=" ];
35
+  nix.binaryCaches = [ "http://nix-serve.hq.c3d2.de" ];
36
+
37
+  services.nginx = {
38
+    enable = true;
39
+    virtualHosts = {
40
+      "server7.hq.c3d2.de" = {
41
+        addSSL = true;
42
+        enableACME = true;
43
+        globalRedirect = "hydra7.hq.c3d2.de";
44
+      };
45
+    };
46
+  };
47
+
48
+
31 49
 }

Loading…
Cancel
Save