Merge pull request #996 from NixOS/norwegian-blue

mweinelt · web-flow · commit a8d7df3e416c · 2026-04-05T03:20:14.000+02:00
macs: adopt norwegian-blue
diff --git a/build/hydra.nix b/build/hydra.nix
@@ -196,6 +196,10 @@ in
     "enormous-catfish.mac.nixos.org".publicKey =
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMlg7NXxeG5L3s0YqSQIsqVG0MTyvyWDHUyYEfFPazLe";
 
+    # M1 Macs at Flying Circus
+    "norwegian-blue.mac.nixos.org".publicKey =
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDQ6Cjvoq5VBYfXl6ZV/ijQ1q4UxbWRYYfkXe0rzmJjf";
+
     # M2 Macs at Oakhost
     "kind-lumiere.mac.nixos.org".publicKey =
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFoqn1AAcOqtG65milpBtWVXP5VcBmTUSMGNfJzPwW8Q";
diff --git a/build/pluto/prometheus/exporters/node.nix b/build/pluto/prometheus/exporters/node.nix
@@ -38,6 +38,8 @@
           {
             labels.role = "mac";
             targets = [
+              # flying circus
+              "norwegian-blue.mac.nixos.org:9100"
               # hetzner
               "intense-heron.mac.nixos.org:9100"
               "sweeping-filly.mac.nixos.org:9100"
diff --git a/build/secrets.nix b/build/secrets.nix
@@ -63,6 +63,10 @@ let
       mimas
       maximum-snail
     ];
+    norwegian-blue-queue-runner-token = with machines; [
+      mimas
+      norwegian-blue
+    ];
     sweeping-filly-queue-runner-token = with machines; [
       mimas
       sweeping-filly
diff --git a/build/secrets/norwegian-blue-queue-runner-token.age b/build/secrets/norwegian-blue-queue-runner-token.age
@@ -0,0 +1,23 @@
+age-encryption.org/v1
+-> ssh-ed25519 cKT5Kw aMrFTLVt8LAofBa0xq3o4EjsxQjRAPtHm13zmSM+6VA
+atGjWVSAl8O9I44eY3BO+QeQ6EDuAEsEBto5matic8s
+-> ssh-ed25519 SZ+mDA VmAYOI/l96zfrGL7UwFB1qVJGTGVGjqmjP4z2+0rIjI
+RKvi/BBAgHkq9Xvqr/sjCBaTFUg4nOTLpQOGejO2ZAU
+-> ssh-ed25519 Gr9EaQ +zszHiPND5T8ORnDZ/tLsOH5F/dtf5/sFMxi/fB4xj4
+kaiFkF95SpTTR8eIpuxnktNMBrIokcExYn4Um7AtG9s
+-> ssh-ed25519 3ENwVg 9CMlmCc3jammJrza2M22LNzzeASMk+nqH9muX9xkMQc
+0J5BDTOKo3HRWNdhVQdv2gzZNrPoqm4bX3zEm05Cwkc
+-> ssh-rsa MuWD+w
+bhIUyi/2y8zeWwYKJsBwqsG5JnPZ12aY9IuLkflKSLpJchAChTujKELFiCuzlGN4
+fvlbqa7mXadzs3pkjnYSz9MjGg/DyFjRsKXfc+jRD+QztNfodFQwJaKn8+9wG0v1
++TmoQ0K5ecSkmzPvS/Ze3itLG2QfZQEIutND7I461ZJK24f4ORt3tANA4F0+INx9
+tVnBMimjp3fb7TI6i7cvUmOytNaoOiipnd0j4caPPkqa9fJ3m9aeeZ58uSkmzo7i
+XejZWHsE+LACMLk/hXS/h7JZQzPQGGqviATOp6a9s59Oq6eqT8V2CgjEwHIAITVp
+vWpuvsxCsxJQkZg4PjLJvA
+-> ssh-ed25519 92bXiA XKApXxi8qr82rvTIPYPbZ/ZFj3sadY7eAbN0DKxvLhM
+Sw8RRumPRL3AaNcTAd7qJnDqxea9h7wMOEubpfU1wx4
+-> ssh-ed25519 Y121Gw bbz5648ZBs2l9WmnP6spocyLNGLx7EvRizuLCH7P4RU
+U0/KXGwVE7aUHeWcE+OANVTTfvQ8jVRqfKOzWCww5m0
+--- Cd10Opop86bxKKJPSCO9yYSY6oAghX0dllm+efexPCA
+r)�P�-i����d|w�M���R�s���"G���XJ�=�VV��9;�uQ����mQMe�y�TL�J�`5�&��j�h���WxgX��w(F�	�
+�-��;&��j¬8��=��B
diff --git a/dns/nixos.org.js b/dns/nixos.org.js
@@ -111,6 +111,8 @@ D("nixos.org",
 
 	A("sweeping-filly.mac", "142.132.141.35"),
 
+	AAAA("norwegian-blue.mac", "2a06:3a80:0:41:423:898a:1e16:3cf7"),
+
 	// hydra staging area
 	A("staging-hydra", "157.180.25.203"),
 	AAAA("staging-hydra", "2a01:4f9:c012:d5d3::1"),
diff --git a/macs/flake-module.nix b/macs/flake-module.nix
@@ -28,6 +28,9 @@
       maximum-snail = mkNixDarwin "maximum-snail" ./profiles/m1.nix;
       sweeping-filly = mkNixDarwin "sweeping-filly" ./profiles/m1.nix;
 
+      # M1 8C, 16G, 256G (Hosted by Flying-Circus)
+      norwegian-blue = mkNixDarwin "norwegian-blue" ./profiles/m1.nix;
+
       # M2 8C, 24G, 1TB (Oakhost)
       eager-heisenberg = mkNixDarwin "eager-heisenberg" ./profiles/m2.large.nix;
       kind-lumiere = mkNixDarwin "kind-lumiere" ./profiles/m2.large.nix;
diff --git a/macs/mac-exec b/macs/mac-exec
@@ -8,6 +8,7 @@ HOSTS=(
 	"hetzner@sweeping-filly.mac.nixos.org"
 	"customer@eager-heisenberg.mac.nixos.org"
 	"customer@kind-lumiere.mac.nixos.org"
+	"root@norwegian-blue.mac.nixos.org"
 )
 PIDS=()
 
diff --git a/macs/mac-update b/macs/mac-update
@@ -16,5 +16,6 @@ update hetzner@maximum-snail.mac.nixos.org
 update hetzner@sweeping-filly.mac.nixos.org
 update customer@eager-heisenberg.mac.nixos.org
 update customer@kind-lumiere.mac.nixos.org
+update root@norwegian-blue.mac.nixos.org
 
 wait "${PIDS[@]}"
diff --git a/ssh-keys.nix b/ssh-keys.nix
@@ -49,6 +49,7 @@ rec {
     intense-heron = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICeSgOe/cr1yVAJOl30t3AZOLtvzeQa5rnrHGceKeBue";
     kind-lumiere = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFoqn1AAcOqtG65milpBtWVXP5VcBmTUSMGNfJzPwW8Q";
     maximum-snail = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEs+fK4hH8UKo+Pa7u1VYltkMufBHHH5uC93RQ2S6Xy9";
+    norwegian-blue = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDQ6Cjvoq5VBYfXl6ZV/ijQ1q4UxbWRYYfkXe0rzmJjf";
     sweeping-filly = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE6b/coXQEcFZW1eG4zFyCMCF0mZFahqmadz6Gk9DWMF";
   };
 }

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@`
`38`	`38`	`{`
`39`	`39`	`labels.role = "mac";`
`40`	`40`	`targets = [`
	`41`	`+ # flying circus`
	`42`	`+ "norwegian-blue.mac.nixos.org:9100"`
`41`	`43`	`# hetzner`
`42`	`44`	`"intense-heron.mac.nixos.org:9100"`
`43`	`45`	`"sweeping-filly.mac.nixos.org:9100"`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ HOSTS=(`
`8`	`8`	`"hetzner@sweeping-filly.mac.nixos.org"`
`9`	`9`	`"customer@eager-heisenberg.mac.nixos.org"`
`10`	`10`	`"customer@kind-lumiere.mac.nixos.org"`
	`11`	`+ "root@norwegian-blue.mac.nixos.org"`
`11`	`12`	`)`
`12`	`13`	`PIDS=()`
`13`	`14`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ rec {`
`49`	`49`	`intense-heron = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICeSgOe/cr1yVAJOl30t3AZOLtvzeQa5rnrHGceKeBue";`
`50`	`50`	`kind-lumiere = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFoqn1AAcOqtG65milpBtWVXP5VcBmTUSMGNfJzPwW8Q";`
`51`	`51`	`maximum-snail = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEs+fK4hH8UKo+Pa7u1VYltkMufBHHH5uC93RQ2S6Xy9";`
	`52`	`+ norwegian-blue = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDQ6Cjvoq5VBYfXl6ZV/ijQ1q4UxbWRYYfkXe0rzmJjf";`
`52`	`53`	`sweeping-filly = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE6b/coXQEcFZW1eG4zFyCMCF0mZFahqmadz6Gk9DWMF";`
`53`	`54`	`};`
`54`	`55`	`}`