diff --git a/devdoc/hosts.md b/devdoc/hosts.md index 3fe5d45..0db82d1 100644 --- a/devdoc/hosts.md +++ b/devdoc/hosts.md @@ -40,11 +40,11 @@ ### `darwin02` -- Provider: Hetzner -- Instance type: [Apple Mac mini M1](https://docs.hetzner.com/robot/dedicated-server/mac-mini/getting-started/) -- CPU: Apple M1 -- RAM: 16GB -- Drives: 256GB SSD +- Provider: OakHost +- Instance type: [Apple Mac mini M2](https://www.oakhost.net/product/mac-mini-hosting-m2-24gb) +- CPU: Apple M2 +- RAM: 24GB +- Drives: 1 TB SSD ### `web02` diff --git a/modules/shared/known-hosts.nix b/modules/shared/known-hosts.nix index 0d6d340..af6ba4e 100644 --- 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 AAAAC3NzaC1lZDI1NTE5AAAAICJqwpMUEl1/iwrBakeDb1rlheXlE5mfDLICVz8w6yi6"; + publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIIcqYTe10t/jJitpfr0lr55lKVltAQkWiMp4tNY7mZQ"; }; hetzner-storage-box = { hostNames = [ "[u348918.your-storagebox.de]:23" ]; diff --git a/secrets.yaml b/secrets.yaml index 93d979d..603bc16 100644 --- a/secrets.yaml +++ b/secrets.yaml @@ -17,7 +17,7 @@ ssh_host_ed25519_key: darwin01: customer: ENC[AES256_GCM,data:zDa+TUczDkjxthze,iv:VdYAf5EP6RjRLkWQzWRRlkWiUKSfoFR8f2GTMMTZg3Q=,tag:8CZSA1qxxOBxbPdzqU4NFg==,type:str] darwin02: - hetzner: ENC[AES256_GCM,data:2ivyayF/bCI7BKGkRSg=,iv:ZKO9rViA7gvQplzaPz47WZlsq6kk7wekVrZOFO1zUqQ=,tag:BA9W7OZZk2Xt5nF7SECnQg==,type:str] + customer: ENC[AES256_GCM,data:chYSwSmHVhy7L2Zi,iv:/IxfJdMVsGAuT0bkWUohEzHZTw5qaSh32GeFtgJFx5s=,tag:VPboLPxieQ42168scO+V1g==,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-07-14T23:11:46Z" - mac: ENC[AES256_GCM,data:ACyhXOmQeoYclCUSkMtBNOgraEBZq/23sqxsCLpsQDlKYZdwn/QxoIJ/o4oN3pwN2SmZ7z7l+aOIQAMSGp8m8KYLGTnXHj4mX13grcWxkE0LDvHN50BFUXw27Jw3sVhTneUyo9RPl3jxTU02OYLquzS4/iYSli6LsZ61QqiNppQ=,iv:lJ+I+S+EbnuHJ2d5TnUanznDTnfpWdZWnSWpHZRYp9w=,tag:CMRQpj2hxbmCj9kvx0XWnA==,type:str] + lastmodified: "2024-07-16T07:30:20Z" + mac: ENC[AES256_GCM,data:nzK1E2M4gnsY/z6KG8uMsOau+Q96u/gRmXue9jA0BKEErEWA2AYg5p9Ig+pRWwhq1BdEN9PbjKBmuEmSTWdfFijbM7NaRSHelpUIccfoiMMW51/MHFiEMt7euCLE2i9O7q1Vx7br+NaHu+fqctrx1ikOXaWNhM6Q6NJ1NY0Z5dU=,iv:1S1NsVtILala9zBFMfEqxpokscpPW+Frq+T1qyrmVYI=,tag:87SYZkvSdqYldcVJnnw2/A==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.0 diff --git a/secrets/hercules-binary-caches.age b/secrets/hercules-binary-caches.age index 497c4af..2d1c3f7 100644 Binary files a/secrets/hercules-binary-caches.age and b/secrets/hercules-binary-caches.age differ diff --git a/secrets/hercules-cluster-join-token.age b/secrets/hercules-cluster-join-token.age index e33caa9..0910e57 100644 Binary files a/secrets/hercules-cluster-join-token.age and b/secrets/hercules-cluster-join-token.age differ diff --git a/secrets/hercules-secrets.age b/secrets/hercules-secrets.age index 556b8c9..f5c4e6d 100644 --- a/secrets/hercules-secrets.age +++ b/secrets/hercules-secrets.age @@ -1,22 +1,22 @@ age-encryption.org/v1 -> ssh-rsa ALNSWw -p191juUB3M1ugsq9G0JSxd8py62YvADEpHGBUrH2g9AVW5tPlsg8DfVMB303OpGf -W3uLnkzFToMkVYRwogZ2fFjRrgL3TzYP/7YtNvSOCK5ISgr/O7gzvN2bef/SmaU5 -hbT55479Fll47swpOyLCmb8MPBpejt7rUIwrWwVYe7H7Iiy0/c2BqnoFH01izCte -JKeNl9zv3W/xC8E+9NBhNy9JzxyE1TTK6lBynf1fm3c1lFzgLuhIyRyw2bfN1Xe7 -zqxGoEwHI2HliMyfWVoqAPIuamMjol5nXftXOdk+iynNoUOC5CYCOvb2izgAMlux -mRi9Isw5+URm9i1ftnne9A --> ssh-ed25519 Qi7vNw UqDd9zpwUG+Zz6GBM/ihh+SSmvlyftVLQ3vGbs8bmig -UtIHBx1seQYsprHUy+gCtHEHHW6DLoLOC8nB0IW5gnE --> ssh-ed25519 MW0fCg fsE5TkypLmOW34SLIjundvPQKvge7om9gxhjTWqBIEg -/N4XYNuD91v30anQ6wvvaF0ed4p4S2qCivpjQjc6Zzk --> ssh-ed25519 92bXiA agh7/NO92cdr6Ks9l++5zmUxDMOG7/kpAuLa2+krrjk -Dw5ZcYsTNLEtISZjbryO6SG9hkxQyvvaqZ23Q9Cg+yQ --> ssh-ed25519 h1lenA UlcCE/LSI99G1JHrMBb30QD1FqW3AGFIWK2pScH7XFg -huP7kMFoCzH28A2F0csofXvAwQ/XL+zUhEmWKzCaaVM --> ssh-ed25519 w3WLfA a8a6jxPciyKv97TlZeFzTPPCTkHkSAtAo3E7zdi3g2E -ZB3//50/GnoPOrBZW2LO3Ro+ufOY5PLrlp4BEEqOSJk --> ssh-ed25519 Iw1MCQ vb99twMuWFPT9hSdu+PNChC8ckCEKugaNA1AmoIO/gw -g51+sN/q/cc/rleg3xda8w1CybnF5gn5hXB97kjtXi8 ---- w6C7jupmvs4mp5Dpwm2Ff2SMs1cPB+kxweTI95HpnI0 -�Y�c����ZA=�Q��+�kg�e����yx�U \ No newline at end of file +JPVTTEpszi2gGu1rOhd0dRV4ebmQe9Hk2h8bBQI/pq5JYV+H0Bh4oTN/CZ3Py9pS +sg9n3TPFmZs3Mg/7sr9o/rHtRB1Eyq0mVGFkDqDiDKu7w9Cyz5GsvX8H0FActa0w +BLFzZb0mpjXk7yqZMrXBejacU9EAWH+qRtReAmyMv9SSs4hEwSNNDPMqBHa8VapV +lEC3s9zPNTCR5SuMb4D8EBMBcZ8i4C1lCiUFOBCr3YRTkH2430PG3uX/543vwKn7 +amHSRxoNk8GxDK2Z3azJfBGa2ESUEBef3g76P/Y0SDEOkg0u09g9/6vnKJ+fGrf8 +Zq/Ydx5N8QinAqiDZhirkA +-> ssh-ed25519 Qi7vNw Nn4EMk/FmRVrOpWEqaLFyKd2P+udGQeJxn7mrEA89Rk +rpUu5ZvxoHReKK/XKFp5zElKyvO/ZkZgbxwxqg9Hbhc +-> ssh-ed25519 MW0fCg cT/e5vLkD/oRVa23QP/0ZzACU4gbajC3UOOHHMCpOlg +a4GEBlXXvcAkM8f7jHS03Fn+Y9AZEmSw57nCc+UULUc +-> ssh-ed25519 92bXiA pwmOz0U2J734URSKYgzmwjU8G64mHc0zXUwx26wW6Rk +uJRltNEU1Xmin9cVFToetPdw+Q1jBO/e5kGooRWDUWM +-> ssh-ed25519 h1lenA NiXmtP+u6lzOmwS1qBE+Aa1LTaCNrN2PelySn6h8jj8 +NUZorwmpdChGzKSJ/OwBACy+1cvkxSynh/PLg5BXHcI +-> ssh-ed25519 w3WLfA 1mpwXgXsSCnu6P8oknOJOmQN2nfkXR4cuk3V4Z8hA2w +yQRB7JHQoJFiePv9qF1x+saTag9nWVGE5fbp4dKHD2k +-> ssh-ed25519 Iw1MCQ BhSpFVwgbZEOauhacPj9MPzYZ+742/p6Vfals7V2KnM +iLSmAz6WSwQJfrEq1jyUxNyA3VssWAJ9U3Bv8ouu1Sw +--- 0taNGRQsutIEP95MVdq2I3kyuold6r85MqKdz3G5li0 +rI�dR[�?���t���y�I�r6���5z��F2 \ No newline at end of file diff --git a/terraform/cloudflare_nix-community_org.tf b/terraform/cloudflare_nix-community_org.tf index 3451415..2870180 100644 --- a/terraform/cloudflare_nix-community_org.tf +++ b/terraform/cloudflare_nix-community_org.tf @@ -92,14 +92,14 @@ resource "cloudflare_record" "nix-community-org-darwin01-AAAA" { resource "cloudflare_record" "nix-community-org-darwin02-A" { zone_id = local.nix_community_zone_id name = "darwin02" - value = "167.235.38.49" + value = "85.209.53.203" type = "A" } resource "cloudflare_record" "nix-community-org-darwin02-AAAA" { zone_id = local.nix_community_zone_id name = "darwin02" - value = "2a01:4f8:262:24af::1" + value = "2a09:9340:808:60b::1" type = "AAAA" }