darwin02: upgrade to M4.M

nix-community · Dec 12, 2024 · 2d9c7d3 · 2d9c7d3
1 parent 30340ae
commit 2d9c7d3
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 35 deletions.
diff --git a/docs/infrastructure.md b/docs/infrastructure.md
@@ -41,9 +41,9 @@
 #### `darwin02` - [`CI builder`](./continuous-integration.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
 
 #### `web02` - [`Monitoring`](./monitoring.md)

diff --git a/hosts/darwin02/default.nix b/hosts/darwin02/default.nix
@@ -7,15 +7,15 @@
     inputs.self.darwinModules.remote-builder
   ];
 
-  nix.settings.max-jobs = 8;
+  nix.settings.max-jobs = 10;
 
-  nixCommunity.darwin.ipv6 = "2a09:9340:808:60b::1 64 fe80::1";
+  nixCommunity.darwin.ipv6 = "2a01:4f8:d1:5715::2 64 2a01:4f8:d1:5715::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/nixos/hydra.nix b/modules/nixos/hydra.nix
@@ -50,7 +50,7 @@ in
         printf "$machines" > $out
         substituteInPlace $out --replace-fail 'ssh-ng://' 'ssh://'
         substituteInPlace $out --replace-fail ' 80 ' ' 3 '
-        substituteInPlace $out --replace-fail ' 8 ' ' 1 '
+        substituteInPlace $out --replace-fail ' 10 ' ' 1 '
       '')
 
       (pkgs.writeText "local" ''

diff --git a/modules/shared/known-hosts.nix b/modules/shared/known-hosts.nix
@@ -22,7 +22,7 @@
     };
     darwin02 = {
       hostNames = [ "darwin02.nix-community.org" ];
-      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIIcqYTe10t/jJitpfr0lr55lKVltAQkWiMp4tNY7mZQ";
+      publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMb/DRvrCZ65QB8OPimqthgUY9MZ+QO3QcFy6mpiUomV";
     };
     web02 = {
       hostNames = [ "web02.nix-community.org" ];

diff --git a/secrets.yaml b/secrets.yaml
@@ -17,7 +17,7 @@ ssh_host_ed25519_key:
 darwin01:
     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]
+    customer: ENC[AES256_GCM,data:GiWlgGPkOC73UpN/,iv:a4fdJ0uw9SZ3bkT6miUH4th2dfJy0xhrFrOgiDR+pc8=,tag:NOGgVeddAVPmNxhyCbyT3w==,type:str]
 nix-community-alert-bot:
     username: ENC[AES256_GCM,data:nA+jbVz3HtDgfDC+y2J4818=,iv:8Q7roobuWuXMnJXWKEJRjKlMYmvFUm5eodX5htLbVHY=,tag:r0FEOL9PByNYtL17hU7ApQ==,type:str]
     home-server: ENC[AES256_GCM,data:k6rsrEvyCUQj,iv:TJBl7dYioATGVYOOETIajkaw+7LKsyrJDI0zmey3Uo4=,tag:ZuSahyrPlmj2qGp8vvuyOw==,type:str]
@@ -111,8 +111,8 @@ sops:
             MkcvL1JyVFBJV0Y5RFFCMGN1OUFXdU0Kdx1wy6ZOOTg1a6VKaq52SMBvC26lMsW/
             oMP+hmXc2WtoqZp+jZ9rrXz6cZW6/dO7CPqxl3aUEKg6BkXIwgyKeg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-12-11T00:17:03Z"
-    mac: ENC[AES256_GCM,data:rkAxmU6Yu4RbSkUvZ7UuxpsR5RgxwU+UTaJ7lX3y9JJP5Rz9qH5HB0xabIJgIsNKR5Bue+xU5JIqkajBtp+neq/+9Qm2CIfiJnsXc6nmcyjC6M2k0rXOJz4s02+tD0uZSW5HjuBOQir447bL5ISFoPzuEOuGvsQ0VO4463b1o3I=,iv:XRCB5ckxbKrbhPyZx/r8WEFIe4lq6lw1Mz2eunnQF6g=,tag:caBxLk67UdwrGIeWNFoYkA==,type:str]
+    lastmodified: "2024-12-12T04:10:17Z"
+    mac: ENC[AES256_GCM,data:MfsZWeIrvoPFXirZu/qPXLyE8Q1IEdLSBX+arQBncgcp1HFyNQHHa4VKnWYT8zbmwrdMMPxDKZLJnihQhmIICiOP19Lub0CwpAPzGhTdpOsMuMW5qoirTL1S89IcURoWoITuBafsxP5Iq2ZsIJK7CzHGK7tQTggmzfhzhjkS4j8=,iv:ea+SCt/qPrPuO8okdSvUNl6VG1rUd8MonTCb34beccE=,tag:iwVwCWjdppGrCt13jpSIRQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.2
diff --git a/secrets/hercules-binary-caches.age b/secrets/hercules-binary-caches.age
diff --git a/secrets/hercules-cluster-join-token.age b/secrets/hercules-cluster-join-token.age
@@ -1,24 +1,24 @@
 age-encryption.org/v1
+-> ssh-ed25519 w3WLfA x/YAHTSiimsim42u9TANr2sQAME5vxERtRYmytjGdjo
+S+XenvJjOIYQrj5ZveVZpULcm6bt/FrWy4uH+UZSiQE
+-> ssh-ed25519 Iw1MCQ MYjn2q/EMnLez6wb6DEh+ix36WRsmRzo9qLOXGxVMHo
+h2WPCfInagKRCIV1bNzCMWMRTS3SHQNV14BNKuspE2I
+-> ssh-ed25519 T9HyUg 7ur+zCdrqTHXGwB3Il1QWHDUD9PhM3tblVi6au7q2lc
+CuqzUS1Oz2L40jXDB6QXEVXy5u9C/G2zvfCHrVUq2Rw
 -> ssh-rsa ALNSWw
-fq0a3DzqSL/2Y+uIvGw4xSAsbqpBYCc/NlzdOxBiPxpxkNNhuLG6PVJqhspQ8Mf4
-r1AjQNaIOqvVlmoiU80Q9kDYBuGeK1Az417tHGCbpPoYAmTsSvBB9mdmmyU8cpUP
-MfeYLol/7r3MjemZj+opEKLaWq2jJTQmtuQZMtZGEz3V2xgcvft/0dlYKT8pd9gV
-QowXNbdmMYYhSCfqouBpGMDbKgVSB0qFoMIRuwhpLo3on9oSxVT6mklLFpOsnmIR
-6c8N7W2GXupPHwCQVCgG9ODP7RXDTMf3o2y03eS3e9e+foLmpRNrQDYZeh9I1N0x
-bopjRnNYCxtCEOucvR8CNw
--> ssh-ed25519 Qi7vNw +hdmrSX/gQMXiJ4AuxQ1TrAnz/tJI+F/o0zL2dPJowM
-Ek68Ny9lKeQXwc/0KlvqbrXlFF2Ne/WztE8M24RO4HI
--> ssh-ed25519 MW0fCg X7AQTlH7F2kufamRFOnlT36Zn0pSkwmXlsV9vjjNXlo
-qDm/hx5oSFlMfNboKcsAET1pBu1NjAYP3iuZ+Fp9mAU
--> ssh-ed25519 92bXiA E/emjIGM8zcD0OhfqcZTBQK2XIQlcYXdEETBGJ2Y+jM
-OGjcCjSvocRI2ibfRV40zcjgmMv05Ofztp9Ks4HApfk
--> ssh-ed25519 h1lenA 48NzdNaJuVgwX2ef3/Lmzwi2DjGe1mboMhe9854ZZG4
-yfO4NGpOF06taOvEhwt4yXy/qSGqiSkOQzdhixkdhUA
--> ssh-ed25519 w3WLfA +6++Z73hkP1Q/lBmH9m2e/rF7eO+4960gVSUXqHWuG0
-RGO3CVf2jTc/6OUzytfgUh7ENsJxUITnlLDnQ+xSGFA
--> ssh-ed25519 Iw1MCQ 0+cfLTtN2FTBi/2l9mSKD/Npr0HoMtST9B2Z1D6WABg
-N3lTGoHXIDoFwTOq0Xop6IIDzjGJapGLj0jcgd67vcw
--> ssh-ed25519 pDXhDA Qln6c5tTYqeFz0oMeqa3wA8wdwJOHzgvfkgPtqj6DFM
-JRFzaPqpmaslS7PiaMWnplxIh11WEKeG2MKjwfDxiC4
---- iplbZKSnfNsY9uuvkRpsPc08Vm3lyFDftvgMvrIk1GU
-l�����4I�SQ)P���t5F���a�LHA��5T��	o�ڎ��|��SRV$*�2e�X���e{��.h�3G��庪�;(S�Y��I/�W<Mmo�i�ne�ϕ�/z'5{��������p�@m�����5���B~3>�r#�H�H��:���c��=����F�(g��!��@�"��Q(�|`�+J�\0NVnf����w�{�3��^a硂n�[�����Olmy��Sl���P�إ�{z��S�9؄<)0b���J��Yh_
+FS4RHiHh1/8Hmv95mql4YKsEaVTfZBgZP8v6GWI15iGXap6Y5RGUYyRJFSxDCBax
+z+CIqEFVBDU27IOLcEE1d4Vu28TTZ58WZNKdJEUNFiV7bJti2sRjhNdDcyLYnqoO
+1R8fa++Ka45uC1aitrtnYlqw9H/ZHG2YKqm5mm08HpQOvXqivGn5sVtcPSSH0Csr
+Xu6a+mXQsrEtP2qDkR7W+ZUYVLxYrfuQczJ82OKfzUK+3G+myDpr/lYI0i97INEU
+rOSFs0SFC4oVwk6wugguCGGt/EaVbe5lBQBUlBMLeGkHGsSRgSHtBcS2ZW8NXYHk
+4OmXPu3e+qRf2iBXIZ1Q4w
+-> ssh-ed25519 Qi7vNw 9r6k1MAP2NOjy7K7zKmE//DLVCOYEGeLnD/HEGBLvjY
+TwEWyOQNqV+xU5MaQtYIf0VeWBL9lNLCrHSBlkxOprA
+-> ssh-ed25519 MW0fCg hyLX8herf6zasDRbYPnBIDKhHdmshpQpugzbjeMRkQk
+0cDaTwxrtaDLKlcMRYbjSXrAqbgFrCeZI9cEBA5HOdQ
+-> ssh-ed25519 92bXiA e6UBcl0RrKgags/0VZVT3bE8re+C9TY15RQrtZRKi1E
+rGhaV4Z2SdsmZ8Vor0/yv13XcOR2J7hYiT0u1g0V68s
+-> ssh-ed25519 h1lenA KEidSVfCZNOlPhFVePBaN6LHyPa95Nx3twjUXHsNzFM
+L0VG+NiujqusrEUoBz6ZaQgWEkyRPaXA8I6o02AIccc
+--- tHo6R3b+X52chttfjIV6SCssiWbZ2ZUAarYOQSfj18U
+�D�T�1�	�_έ�*���`��� �#�^����(k,��i�M��\S��͌{�*͎���TY<?*��#����s8$ږ1��x]�eF$����1p��GBX���B��M�H�d6�q�N��/m�W��h��vu��j�u�J�'���S_?y��s��Z���o�6�]�Q���H��`�[DpN�r?l�2Kt��0����ϒ��x샼sä�j�\t#i40`��0����9��hz��=:��4K}�U����

diff --git a/terraform/cloudflare_nix-community_org.tf b/terraform/cloudflare_nix-community_org.tf
@@ -28,8 +28,8 @@ locals {
       ipv6 = "2a01:4f8:d1:5716::2"
     }
     "darwin02" = {
-      ipv4 = "85.209.53.203"
-      ipv6 = "2a09:9340:808:60b::1"
+      ipv4 = "49.12.162.21"
+      ipv6 = "2a01:4f8:d1:5715::2"
     }
     "web02" = {
       ipv4 = "46.226.105.188"