Browse Source

hosts/hydra: upgrade to 20.03, use server7 builder

master
Emery Hemingway 5 months ago
parent
commit
b390162f36
3 changed files with 14 additions and 1 deletions
  1. 4
    0
      hosts/hydra/configuration.nix
  2. 5
    1
      hosts/hydra/hydra.nix
  3. 5
    0
      hosts/server7/default.nix

+ 4
- 0
hosts/hydra/configuration.nix View File

@@ -22,6 +22,10 @@
22 22
 
23 23
   nixpkgs.config.allowUnfree = true;
24 24
 
25
+  security.acme = {
26
+    email = "mail@c3d2.de";
27
+    acceptTerms = true;
28
+  };
25 29
   security.pam.enableSSHAgentAuth = true;
26 30
 
27 31
   services.openssh = {

+ 5
- 1
hosts/hydra/hydra.nix View File

@@ -15,8 +15,11 @@
15 15
       allowed-uris = http:// https://
16 16
     '';
17 17
     buildMachines = [{
18
-      hostName = "localhost";
18
+      hostName = "server7.hq";
19
+      sshUser = "hydra";
20
+      sshKey = "/var/lib/hydra/queue-runner/id_rsa";
19 21
       system = "x86_64-linux";
22
+      speedFactor = 2;
20 23
       supportedFeatures = [ "kvm" "nixos-test" "big-parallel" "benchmark" ];
21 24
       maxJobs = 8;
22 25
     }];
@@ -27,6 +30,7 @@
27 30
     hydraURL = "https://hydra.hq.c3d2.de";
28 31
     logo = ./c3d2.svg;
29 32
     notificationSender = "hydra@spam.works";
33
+    package = pkgs.hydra-unstable;
30 34
     useSubstitutes = false;
31 35
   };
32 36
 

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

@@ -154,4 +154,9 @@ in {
154 154
   time.timeZone = "Europe/Berlin";
155 155
 
156 156
   system.stateVersion = "19.09"; # Did you read the comment?
157
+
158
+  users.extraUsers.hydra.openssh.authorizedKeys.keys = [
159
+    # allow the old hydra to build here
160
+    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7HuDlyTlPC4rCjwhklY8kiYIxdgPhiu6wxs29ksnpKZmJa2R7qoD02N3ACm9cTb1GVkIWukAXI3KvU9h08+WLQJqUH0cHVBj3V1sDYmkN2QecE59gz3e1gfN3zPtwmQEUe6xvHWK3X3qdH45pGPUtxk1eDTZl45037C0NClWF7RXI4m6UXng4bL9wnPvoVqCI+ySsNWaTkHDLE/D9s/VrqGxJ1w2KiJb1F73g9/x/zjL8Ixb16wkPmLE0e50MQAQa7EMFTyPZoEskFnEviLYXM9pDexABAjJfbfZ39lLyMgVYGwnzEDbjDlm68dE6wQWUY1OV6wbt8uYreB2IRrlb root@hydra"
161
+  ];
157 162
 }

Loading…
Cancel
Save