Add the hetzner macs to eris
Graham Christensen committed
Sep 26, 2022 at 10:24 UTC
8656ebb9c92016498e1b0660f746f03b82a1e515
2 files changed
+15
-34
delft/eris.nix
+10
@@ -237,6 +237,16 @@ in
237
];
238
labels.role = "bastion";
239
}
240
+ {
241
+ targets = [
242
+ "intense-heron.mac.nixos.org:9100"
243
+ "sweeping-filly.mac.nixos.org:9100"
244
+ "maximum-snail.mac.nixos.org:9100"
245
+ "growing-jennet.mac.nixos.org:9100"
246
+ "enormous-catfish.mac.nixos.org:9100"
247
+ ];
248
+ labels.role = "mac";
249
+ }
250
];
251
}
252
{
delft/hydra.nix
+5
-34
@@ -132,26 +132,6 @@ in
132
Host macstadium-m1-44911207
133
Hostname 208.83.1.145
134
Compression yes
135
-
136
- Host hetzner-m1-1638981
137
- Hostname 23.88.75.215
138
- Compression yes
139
-
140
- Host hetzner-m1-1640609
141
- Hostname 142.132.141.35
142
- Compression yes
143
-
144
- Host hetzner-m1-1640635
145
- Hostname 23.88.76.161
146
- Compression yes
147
-
148
- Host hetzner-m1-1643080
149
- Hostname 23.88.76.75
150
- Compression yes
151
-
152
- Host hetzner-m1-1643228
153
- Hostname 142.132.140.199
154
- Compression yes
135
'';
136
137
services.openssh.knownHosts = {
@@ -164,21 +144,12 @@ in
144
mac-m1-5 = { hostNames = [ "10.254.2.105" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHbYjdeghSNg7bU/ER/pTSGwP7Fyd7+OteD06dP4gCfP"; };
145
mac-m1-6 = { hostNames = [ "10.254.2.106" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA8B5Ek8GhWCO5Qahl20CHn/txxvAweupuIbFmuLjciG"; };
146
167
-
168
- # Note that these IPS and SSH public keys are correct, but the machines are dedicated to ofborg for now,
169
- # and therefore should not and cannot be put in to rotation in hydra.
170
- macstadium-x86-44911305 = { hostNames = [ "208.83.1.173" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOtMZwCu5D/CRTTC8wvZWP+H7xkCCHjQZ//XVM4vmdZU"; };
171
- macstadium-x86-44911362 = { hostNames = [ "208.83.1.175" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHjQFkuDYP5qBgvFZvwbJb0g4CTV8/FcHPCOT7Wmlkmr"; };
172
- macstadium-x86-44911507 = { hostNames = [ "208.83.1.186" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMOMJFJhA4y5w72n3eRlb1RtcZc4gsc4UNHVQkBf6xZY"; };
173
- macstadium-m1-44911104 = { hostNames = [ "208.83.1.181" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOX5EjsuYGcHEoIIX9c3J12xkL+z3Dz/3xby9KnTGpVG"; };
174
- macstadium-m1-44911207 = { hostNames = [ "208.83.1.145" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICFDCv348yhWE2Tok+b2MALh8kNlgLGCCZqdaNLYN2U0"; };
175
-
147
# These IPs and SSH public keys are specifically provisioned for Hydra
177
- hetzner-m1-1638981 = { hostNames = [ "23.88.75.215" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMXOk44SDOmkZNtOcviM5LIA6yVOmEclPRQTqndvIxyU"; };
178
- hetzner-m1-1640609 = { hostNames = [ "142.132.141.35" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF+kukRUsxSBsW5xITI65pAixwoWx4b6LtASRzFqM2xX"; };
179
- hetzner-m1-1640635 = { hostNames = [ "23.88.76.161" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH6Y9cfoJ+6TNS1EbE3OUocnyUtnTtJ0fJybK2+gyVmN"; };
180
- hetzner-m1-1643080 = { hostNames = [ "23.88.76.75" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEIUYnFY0tnASbzZOHruwj3n4nX5gT0Zco2Xjv7frINn"; };
181
- hetzner-m1-1643228 = { hostNames = [ "142.132.140.199" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINEevWFDXtUmbaZYiOmPL4uZVXVdHfQ2fMAMGunfDAAT"; };
148
+ "intense-heron.mac.nixos.org" = { hostNames = [ "23.88.75.215" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMXOk44SDOmkZNtOcviM5LIA6yVOmEclPRQTqndvIxyU"; };
149
+ "sweeping-filly.mac.nixos.org" = { hostNames = [ "142.132.141.35" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF+kukRUsxSBsW5xITI65pAixwoWx4b6LtASRzFqM2xX"; };
150
+ "maximum-snail.mac.nixos.org" = { hostNames = [ "23.88.76.161" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH6Y9cfoJ+6TNS1EbE3OUocnyUtnTtJ0fJybK2+gyVmN"; };
151
+ "growing-jennet.mac.nixos.org" = { hostNames = [ "23.88.76.75" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEIUYnFY0tnASbzZOHruwj3n4nX5gT0Zco2Xjv7frINn"; };
152
+ "enormous-catfish.mac.nixos.org" = { hostNames = [ "142.132.140.199" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINEevWFDXtUmbaZYiOmPL4uZVXVdHfQ2fMAMGunfDAAT"; };
153
154
stan = { hostNames = [ "stan.ewi.tudelft.nl" "131.180.119.74" ]; publicKey = "ssh-dss AAAAB3NzaC1kc3MAAACBAL0SlYpGjDjPKrLIwoltYHHTYo/d6Ct2FQZKh4ltKOszWPYYAbs/YNSm2eFkvj0CGc3aastFuebz6+pRfvGMvqi4q6IoHwVvOkbWMadyuqrWIO+Z1YemZP/GAG69pLy+UyoydiSI83ycwPe4YARAU/cpBMNKJZbSxyrO80XatmtRAAAAFQC291WK+9M8+zI4KAtk6EqX0vqQ1QAAAIBd1YgRfdfRdu60BpR+3/YMbSYZMjRLFPyoSgmEQR2TtKfqsuKTsTREzB20iMgFlhEWb6C4r5y6jYDU85OOnvpf7zne22j6bKFDIiAbgsjUFHK1EB7+TBltf5yqq0FyNOy/PnLqVzOeGaUeCOc3Ris71Lxkm60oVF4mjut2d2UJ6AAAAIByuCH1bIIRb4za4yiiFQUz2CBX1XHhBn/h/LhNMLuyCTciG6tkppGBAgq5rWrNhjaEc7dIFgZR+E1wE5PQzWG/TBiXctwCOqOOErDB5b95jO2EntIhi8x5PO9Ef6jgis4QRsBIZiENDDeQHxFHCv4q+10TpyV+625O8TXkkcxl0g=="; };
155