darwin01: upgrade to M4.M

nix-community · Dec 11, 2024 · 30340ae · 30340ae
1 parent 9127b95
commit 30340ae
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/docs/community-builder.md b/docs/community-builder.md
@@ -9,7 +9,7 @@ build-box.nix-community.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIElIQ54qAy7Dh63r
 `aarch64-darwin`, `x86_64-darwin`
 
 ```
-darwin-build-box.nix-community.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFz8FXSVEdf8FvDMfboxhB5VjSe7y2WgSa09q1L4t099
+darwin-build-box.nix-community.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDZw+Zk6dKiiXVx2Zlo67b6uQ3o+BhPn9UU9BC6SIgZ4
 ```
 
 [_Note: currently the darwin build box doesn't support FIDO keys._](https://github.com/nix-community/infra/issues/1007)

diff --git a/docs/infrastructure.md b/docs/infrastructure.md
@@ -33,9 +33,9 @@
 #### `darwin01` - [`darwin-build-box.nix-community.org`](./community-builder.md)
 
 - Provider: OakHost
-- Instance type: [Apple Mac mini M2](https://www.oakhost.net/product/mac-mini-hosting-m2-24gb)
-- CPU: Apple M2
-- RAM: 24GB
+- Instance type: [Apple Mac mini M4.M](https://www.oakhost.net/product/mac-mini-hosting-m4-32gb)
+- CPU: Apple M4
+- RAM: 32GB
 - Drives: 1TB SSD
 
 #### `darwin02` - [`CI builder`](./continuous-integration.md)

diff --git a/hosts/darwin01/default.nix b/hosts/darwin01/default.nix
@@ -5,15 +5,15 @@
     inputs.self.darwinModules.community-builder
   ];
 
-  nix.settings.max-jobs = 8;
+  nix.settings.max-jobs = 10;
 
-  nixCommunity.darwin.ipv6 = "2a09:9340:808:630::1 64 fe80::1";
+  nixCommunity.darwin.ipv6 = "2a01:4f8:d1:5716::2 64 2a01:4f8:d1:5716::1";
 
   nix.settings.sandbox = "relaxed";
   nix.settings.extra-platforms = [ "x86_64-darwin" ];
 
   # disable nixos-tests
   nix.settings.system-features = [ "big-parallel" ];
 
-  system.stateVersion = 4;
+  system.stateVersion = 5;
 }
diff --git a/modules/shared/known-hosts.nix b/modules/shared/known-hosts.nix
@@ -18,7 +18,7 @@
     };
     darwin01 = {
       hostNames = [ "darwin01.nix-community.org" ];
-      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFz8FXSVEdf8FvDMfboxhB5VjSe7y2WgSa09q1L4t099";
+      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDZw+Zk6dKiiXVx2Zlo67b6uQ3o+BhPn9UU9BC6SIgZ4";
     };
     darwin02 = {
       hostNames = [ "darwin02.nix-community.org" ];

diff --git a/secrets.yaml b/secrets.yaml
@@ -15,7 +15,7 @@ ssh_host_ed25519_key:
     build04: ENC[AES256_GCM,data:e8qLPiTruUq1OSgfR6KQ/zXMeLeTapH8k9viglYdz0mjG198oKPc2JNgLsuL8vFBafJ9P0SHJlKH6wQNApPNgEaktfTpx11WlK5oEa9J/Bw3OuFUJnyRE3UzxvWNzj5BVIk6pQBDhc2rOucAbiWwTJu76Wxopd5PQ5GVyEK2OIYaZ2rG2ZlF9RbfZgfiq0HBkZhPfL4osUMGmFRsa6p18xH4wm+Ey08n5DG27AxGf7yjKiXswlZfzgxX3ukqsNw5pw3GNHRLjlsJsprTMVj+hgS5N3PeY+IViJKHE0VmEU3pJzlFSAk05mTrYzJ0jHlfQTbWHs6wYkc3EbKXG83zcviowGMK78P8Qpy0h9/3+r1I55/3UAd4JKnGbz+ADTMwowgNeZO/Vv0LQN3zspyfmYiQ3sD55kdGLWVnWFXZ1m0x+3D+CK7KaH7hqoT0GY2rYFwvM5fXKy7ekrGtpUyZPy8iQw6Vxl0+bcKgU6IcWYikZ32XvR4bjY9uDBvuS+Kk1e7y9WTy2h0p5fw7T2aWE/rw9m5TuUnn13gRHo1KRfNApzQckc5NbXG+VhMrQ9y1,iv:to8K9ljpumnRFz7lmxi0C6JT6xME3Sukh2jWRYkZlPg=,tag:puIarMsuxMidHOJ18ZO2mQ==,type:str]
     web02: ENC[AES256_GCM,data:KR3sChbsD8B2OPyWgrUXsXcOZa5GgYrP819LuIQt9kmd83KIidG0AzuPbHjnpB4gLRgLzMUEGXzretmITHr8llIlFzzehLXulLsdBNT4FiyD80CjzUUxT/L1TadSWCqf8DMn581t6CwdpYaOPfrAesxD4ZJE0O/6oa6/pUG6AYAgFui56PAfUb1A04O8/hYZu5M9o+OxYeX7Ep3w3Fn0815Oe2qeILdjmIgecaKmc+rscJL8CrDanX5qYdAnzBEL0U8uWhDalVtHmgvTUcITeyjDNeVR0Zb76Xfl6HJb9HOpXS6DfPugONAEGyigte3PHd8lQbGArtR3UxVl95z2gQRcDIEHiYPnR1CHs1HEmLjCGot0jOnC9mHC/NAb6EYrnmRNxgu0elR3O6PNwf89Nu3Jq87GPlVTbggMg4bW8/d+ZnsOPUDSfB6F9HMDjKqu0qJdRt9D6VV/OfH537vw+XPgw/9Evdhb4tL5qX3FVjyxDSU1v5thnzum4mGoZI0S2EReRO/MO11orpIBeNOw4bwzPl7ftD6Emb0v,iv:qcewvFVbCppM0063eAVE2qkl348X3Pocm3dd+H/9Hko=,tag:QlXb7KkWV6tztq6kAbIhlw==,type:str]
 darwin01:
-    customer: ENC[AES256_GCM,data:zDa+TUczDkjxthze,iv:VdYAf5EP6RjRLkWQzWRRlkWiUKSfoFR8f2GTMMTZg3Q=,tag:8CZSA1qxxOBxbPdzqU4NFg==,type:str]
+    customer: ENC[AES256_GCM,data:Ygqt1vjB9S95ME5S,iv:Rxjskp16qkiIP5+yqmQK76pGKL0Uu4qrDSOQRaQMlIU=,tag:A4aDNEWRDDnRrQr2/WwEvg==,type:str]
 darwin02:
     customer: ENC[AES256_GCM,data:chYSwSmHVhy7L2Zi,iv:/IxfJdMVsGAuT0bkWUohEzHZTw5qaSh32GeFtgJFx5s=,tag:VPboLPxieQ42168scO+V1g==,type:str]
 nix-community-alert-bot:
@@ -111,8 +111,8 @@ sops:
             MkcvL1JyVFBJV0Y5RFFCMGN1OUFXdU0Kdx1wy6ZOOTg1a6VKaq52SMBvC26lMsW/
             oMP+hmXc2WtoqZp+jZ9rrXz6cZW6/dO7CPqxl3aUEKg6BkXIwgyKeg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-11-24T01:03:20Z"
-    mac: ENC[AES256_GCM,data:XA6/nsjHlpn7kgFPdifYKdWgswuq6vXmIBpzfRAPgucYZiaxWhinuv5tXKXgI5b0wPwVWb40l6poE2qA5ExOXKV5tzk0uPEaNVlPDEB5z24Ya5eXhOWMhxlSlfeCM+xPyY/egsFhg/Ewm0eax/nHKsZYOZw7a9RYr2Ch42G6xk4=,iv:smuKPEdbHGg4JH27mOsFulSLu0ATJsjX0oZe9LlGBPQ=,tag:HA34KNDy7yrkkBqie+CIGA==,type:str]
+    lastmodified: "2024-12-11T00:17:03Z"
+    mac: ENC[AES256_GCM,data:rkAxmU6Yu4RbSkUvZ7UuxpsR5RgxwU+UTaJ7lX3y9JJP5Rz9qH5HB0xabIJgIsNKR5Bue+xU5JIqkajBtp+neq/+9Qm2CIfiJnsXc6nmcyjC6M2k0rXOJz4s02+tD0uZSW5HjuBOQir447bL5ISFoPzuEOuGvsQ0VO4463b1o3I=,iv:XRCB5ckxbKrbhPyZx/r8WEFIe4lq6lw1Mz2eunnQF6g=,tag:caBxLk67UdwrGIeWNFoYkA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.9.1
+    version: 3.9.2
diff --git a/secrets/community-builder-nix-access-tokens.age b/secrets/community-builder-nix-access-tokens.age
diff --git a/terraform/cloudflare_nix-community_org.tf b/terraform/cloudflare_nix-community_org.tf
@@ -24,8 +24,8 @@ locals {
       ipv6 = "2a01:4f9:3051:3962::2"
     }
     "darwin01" = {
-      ipv4 = "85.209.53.240"
-      ipv6 = "2a09:9340:808:630::1"
+      ipv4 = "49.12.162.22"
+      ipv6 = "2a01:4f8:d1:5716::2"
     }
     "darwin02" = {
       ipv4 = "85.209.53.203"