diff --git a/hosts/hydra/configuration.nix b/hosts/hydra/configuration.nix index b76dab2e..b4b7a87d 100644 --- a/hosts/hydra/configuration.nix +++ b/hosts/hydra/configuration.nix @@ -22,6 +22,10 @@ nixpkgs.config.allowUnfree = true; + security.acme = { + email = "mail@c3d2.de"; + acceptTerms = true; + }; security.pam.enableSSHAgentAuth = true; services.openssh = { diff --git a/hosts/hydra/hydra.nix b/hosts/hydra/hydra.nix index 5a187b71..f00d958f 100644 --- a/hosts/hydra/hydra.nix +++ b/hosts/hydra/hydra.nix @@ -15,8 +15,11 @@ allowed-uris = http:// https:// ''; buildMachines = [{ - hostName = "localhost"; + hostName = "server7.hq"; + sshUser = "hydra"; + sshKey = "/var/lib/hydra/queue-runner/id_rsa"; system = "x86_64-linux"; + speedFactor = 2; supportedFeatures = [ "kvm" "nixos-test" "big-parallel" "benchmark" ]; maxJobs = 8; }]; @@ -27,6 +30,7 @@ hydraURL = "https://hydra.hq.c3d2.de"; logo = ./c3d2.svg; notificationSender = "hydra@spam.works"; + package = pkgs.hydra-unstable; useSubstitutes = false; }; diff --git a/hosts/server7/default.nix b/hosts/server7/default.nix index bbe60f46..84e06653 100644 --- a/hosts/server7/default.nix +++ b/hosts/server7/default.nix @@ -154,4 +154,9 @@ in { time.timeZone = "Europe/Berlin"; system.stateVersion = "19.09"; # Did you read the comment? + + users.extraUsers.hydra.openssh.authorizedKeys.keys = [ + # allow the old hydra to build here + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7HuDlyTlPC4rCjwhklY8kiYIxdgPhiu6wxs29ksnpKZmJa2R7qoD02N3ACm9cTb1GVkIWukAXI3KvU9h08+WLQJqUH0cHVBj3V1sDYmkN2QecE59gz3e1gfN3zPtwmQEUe6xvHWK3X3qdH45pGPUtxk1eDTZl45037C0NClWF7RXI4m6UXng4bL9wnPvoVqCI+ySsNWaTkHDLE/D9s/VrqGxJ1w2KiJb1F73g9/x/zjL8Ixb16wkPmLE0e50MQAQa7EMFTyPZoEskFnEviLYXM9pDexABAjJfbfZ39lLyMgVYGwnzEDbjDlm68dE6wQWUY1OV6wbt8uYreB2IRrlb root@hydra" + ]; }