Merge pull request #1000 from NixOS/update-macs

Update the Mac inventory

Author: mweinelt

build/hydra.nix

@@ -178,12 +178,6 @@ in
     "hopeful-rivest.builder.nixos.org".publicKey =
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBgjwpQaNAWdEdnk1YG7JWThM4xQdKNJ3h3arhF7+iFm";
 
-    # M1 Macs in North America
-    "*.foundation.detsys.dev" = {
-      certAuthority = true;
-      publicKey = "@cert-authority *.foundation.detsys.dev ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDBQ55ccEXJHIY9Cde6hSx26zTOju0RIXzuJL2uxmKrSc6l2SsZV3RsejfY3vp4Zhs/UVhk9VBkaiYY6bMg1SW6f9A0fBrPOSSytRwKgW/XCO605bdpNlGC5sKFGQAuOZfhFEeW9mInhjn1Pkz63gINrI3jWEM1mWJMKwLpstC2P0wXX3kWxQutPjIQrGqKP+TRiYdWcy+dWUFItXcBQkBRk+2xC24PL4s5JLGJffx/pNt+WnZqADIEu42WgrQiiz5OPGoGwlzDNgcWltuHdYaDtKU7bDY4wZxWa/HZGNju1vqLbVPai/Fo4EpONjKr4+EJpInxTpmjm4rcXHmCNmf2fEjZvbpXVcocj/NHp0IuusSLfMo3JfUTo6Vo5gyDjEETWDm1y++pWp5aZ0Dss1mJAbkUN/arMqIIj1RcmLFYf7p9Y1mE7axHZL3BFIlsHxAnZle+ouxPUSIstq9GrD1b3rIC03lTqEH0eTikEpoJAU3OIK5Eoi7vuJyDTtd8rzxPhsv3ScxBGJF6BRbyaaBsqjXWphxzlmzKvwH0psLoE3NuS46EQ5VXq4A4p0KgcuybccuxYMDSf81u96LSIm4f7yWZcE7+iXTollc3tn48uxWFSFNLxzo7RixmJ0R/cRPY6KlOUUJyurWO/bMxSc9rxCJpVrrr/0cMbBbEggICEw==";
-    };
-
     # M1 Macs at Hetzner
     "intense-heron.mac.nixos.org".publicKey =
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICeSgOe/cr1yVAJOl30t3AZOLtvzeQa5rnrHGceKeBue";

macs/README.md

@@ -4,22 +4,30 @@ See [inventory](../docs/inventory.md).
 
 ## Inventory
 
-### At Graham's place
+### Obisdian Systems (US Hosting)
 
-We have mac-mini's are in [Grahams](https://github.com/grahamc) house, that only
-[@cole-h](https://github.com/cole-h) can deploy:
+They are hosting five Macs Minis for us in the United States.
 
-- becoming-hyena.foundation.detsys.dev
-- cosmic-stud.foundation.detsys.dev
-- quality-ram.foundation.detsys.dev
-- tight-bug.foundation.detsys.dev
+Contact: [@ryantrinkle](https://github.com/ryantrinkle)
 
-- These are getting erased and automatically redeployed from the configuration
-  in this directory.
+- Mac Mini (M1 2020, 16 GB, 256 GB)
+- Mac Mini (M1 2020, 16 GB, 256 GB)
+- Mac Mini (M1 2020, 16 GB, 256 GB)
+- Mac Mini (M1 2020, 16 GB, 256 GB)
+- Mac Mini (i3-8100B, 8GB, 128 GB)
+
+### Flying Circus (DE Hosting)
+
+Currently hosting two Mac Minis for us in Germany.
+
+Contact: [@ctheune](https://github.com/ctheune)
+
+- Mac Mini (M1 2020, 16 GB, 256 GB)
+- Mac Mini (M1 2020, 16 GB, 256 GB)
 
 ### Hetzner
 
-Additional we have five M1 builders at Hetzner online:
+Additional we rent five M1 (16 GB, 256 GB) builders at Hetzner online:
 
 - enormous-catfish.mac.nixos.org
 - growing-jennet.mac.nixos.org
@@ -31,6 +39,12 @@ These are maintained by the build infra team.
 
 ### Oakhost
 
+Two M2 Mac Mini with 24 GB RAM and 1 TB disk are sponsored by
+[Oakhost](https://www.oakhost.com/).
+
+If you are looking for Mac Hosting in the EU, we can recommend Oakhost. They
+offer a great admin experience with ad-hoc KVM access in the browser.
+
 - eager-heisenberg.mac.nixos.org
 - kind-lumiere.mac.nixos.org