From df043d1486e03da214011c92793e4d2dc7ae582c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 19 Jul 2023 07:02:16 +1000
Subject: [PATCH] remove aarch64.nixos.community
---
docs/community-builder.md | 2 +-
flake.nix | 1 -
hosts/build01/configuration.nix | 1 -
hosts/build01/secrets.yaml | 5 ++---
modules/nixos/common/security.nix | 4 ----
.../aarch64-nixos-community.nix | 20 -------------------
6 files changed, 3 insertions(+), 30 deletions(-)
delete mode 100644 modules/nixos/remote-builder/aarch64-nixos-community.nix
diff --git a/docs/community-builder.md b/docs/community-builder.md
index 38e561c..9feff22 100644
--- a/docs/community-builder.md
+++ b/docs/community-builder.md
@@ -1,6 +1,6 @@
`build01.nix-community.org`
-We provide an `x86_64-linux` build machine as a public remote builder for the nix community, this machine also has an `aarch64-linux` machine configured as its own remote builder.
+We provide an `x86_64-linux` build machine as a public remote builder for the nix community.
#### Access
diff --git a/flake.nix b/flake.nix
index fe5a76d..c9ee0ff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -160,7 +160,6 @@
hydra = ./modules/nixos/hydra.nix;
nur-update = ./modules/nixos/nur-update.nix;
raid = ./modules/nixos/raid.nix;
- remote-builder-aarch64-nixos-community = ./modules/nixos/remote-builder/aarch64-nixos-community.nix;
remote-builder-build04 = ./modules/nixos/remote-builder/build04.nix;
remote-builder-darwin02 = ./modules/nixos/remote-builder/darwin02.nix;
remote-builder-darwin03 = ./modules/nixos/remote-builder/darwin03.nix;
diff --git a/hosts/build01/configuration.nix b/hosts/build01/configuration.nix
index e16aa70..e2f5f85 100644
--- a/hosts/build01/configuration.nix
+++ b/hosts/build01/configuration.nix
@@ -16,7 +16,6 @@
inputs.self.nixosModules.raid
inputs.self.nixosModules.zfs
inputs.self.nixosModules.community-builder
- inputs.self.nixosModules.remote-builder-aarch64-nixos-community
inputs.self.nixosModules.cachix-deploy
];
diff --git a/hosts/build01/secrets.yaml b/hosts/build01/secrets.yaml
index 7921474..9119982 100644
--- a/hosts/build01/secrets.yaml
+++ b/hosts/build01/secrets.yaml
@@ -1,5 +1,4 @@
ssh_host_ed25519_key: ENC[AES256_GCM,data:dDy8vWXdGwJTE8Y/DoOymD9mUXFWi/OkA5fydJ+PxOR1fZAszxVWGtb61mmiVD47guAP1Dt3H5+0V+uAU07SB8T0pCXy7u0/3WhCYRnciEgeq3LmXlH4DuEZGmgn2gyHGPos+bwvn2NCzYwbu0xnG0VtogN0geg1kOSDhnMKcbAKs7cy3KGJoEROAtkVV60ehgLmbL/Zpy8Qi9fW8PTVbZC/5RauFabvc6XpE0D8iKo/jESBrj891+pg2K3sIjXsXhweW+AvAPgcBq591DnaLllbcZ1U5PVMtiCR0oopdcohoreylzWL5F77mHQBRv82RMQ5MJ/kdcJldHSauS4yAKrI3QqwlIBb2KKPJW3sY/eEoeqvMkW1cc6gRp+Gha/FDQmNc9kgOuoru0vfwp82CEFY4TqlhqOd7pqNtFFP6NCbsJNt2ixlbHK/HVm2JC1JKNuAU4sRK4sq/esrzmZsxxZoNY/epplH+CvaoVt+zD7yWPN8rYWXjb33OePsp2u3OQEA1dl9Fl8WIxi1gRy/BCnw2VlSDWd/tqykpJd6cZTcAds=,iv:SAP3WMpYW2U/IRJmUeTlntlkHYrd7d3JD1zB0hJkHnU=,tag:LwVUTelkr8HAyYSY/mGQrA==,type:str]
-aarch64_nixos_community: ENC[AES256_GCM,data:NKxnuw29KQqBMNzFV2VjdW9u4w6LVmGZ7bVDdpm+LFtt09kQ+wBGbcA03JVzIJljz7D5TyqCZKD3RUqV20Her2S4eFPp874PgTjhfrbgsqPUWw6gai5Vkuvc8c9SQXtgjqiC/YH0tE5mhb3XbmMBaQ7fKgm2USTxhG1x2aROEf6csqvc7AV5MLHjhiKdR346XzrUusjxgDAz3iTIZ/B2ZHPx0uWkC/25hi2KPWvIL9cWH5CxzLBs1ONhVsv/zMjjk93ElwGrAXSO6SsIiHkPX4n8m95I023AhN06gsjJdQr+ZByht5TINSgXcRIDX6P5/YiRKyx3dJU66gPXxWD3gxz37LZYUlwu3zZOe0paqyuhX2vbKF7SrN8SCtlOCjo9QGXfSeLarriJfUEt4KoklopzNzGIg1+g1hc7IgMeXmueQoXwE6OSeqiTas83LufWiIxWF3phcL7wRhza915Y1nTUvoZ08feBJAXbZSDUBZ0k5sXt9A3Fe0Wqwu9TtezBI5NK,iv:QtukYyk5fX59Wfhua9A++rFXnAS8DEL06xZ5LUlKaLo=,tag:iEfPNa/YMF3J3/fXD4gXxA==,type:str]
sops:
kms: []
gcp_kms: []
@@ -60,8 +59,8 @@ sops:
YzVtN0F2NlJVeG42ckNjOEtGZ1NnWG8KDqsjbgzQcpK9nUKDckRVTjrPtw8K0gkK
zGNyj8yh7cUyXaizStiJy6oZoys1iujWfKEyaUd2fuDxdEEB2KnZaw==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2023-04-24T21:58:51Z"
- mac: ENC[AES256_GCM,data:F0T6QcjxbH16vH2w1Nq+jAFtCPNYiFkoVsaEBQyl0mP9RDMwo1QzxzXGrmMKydptGecE7mJQ2DHaxOhlMWKsqCGY7LEDmkzm/DCXOs1QoCUuUg0KOc3oRqTXcveyEa8CQQ6DAq+3K2F3Er7pDehh+NjeeQ3lRcsrVN5cZ571ku8=,iv:gO7BzitWqEZ0aRBwFuOl30utGBLdNwU6qoTmgaX+oiM=,tag:cl8O6p6a731dKtzrX1It8Q==,type:str]
+ lastmodified: "2023-07-18T21:02:04Z"
+ mac: ENC[AES256_GCM,data:4nMPJydcNjhUP/26djT6TR4FryccGl8XgrRMecH7EBTPmXXQ9y5oT6winyXUVl9cuoazqtvxum5cQxsb38T1A+Ig3Jx+AbwpJMJMYDXyC0wvCBT40HTFtu9TyoiRse30DIfZbatnnnUxW4UM0GuDmOzwlW13l9BEgOijQk14RgE=,iv:OBgkB5PpP2yrpXUvRrzajppq9p6e8g/o/hsSAfd9BVU=,tag:eGk/FClnPw+lmeIjJZy7qQ==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.3
diff --git a/modules/nixos/common/security.nix b/modules/nixos/common/security.nix
index 4f1d293..e89f8b6 100644
--- a/modules/nixos/common/security.nix
+++ b/modules/nixos/common/security.nix
@@ -27,10 +27,6 @@
hostNames = [ "darwin03.nix-community.org" ];
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKX7W1ztzAtVXT+NBMITU+JLXcIE5HTEOd7Q3fQNu80S";
};
- aarch64-nixos-community = {
- hostNames = [ "aarch64.nixos.community" ];
- publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMUTz5i9u5H2FHNAmZJyoJfIGyUm/HfGhfwnc142L3ds";
- };
hetzner-storage-box = {
hostNames = [ "[u348918.your-storagebox.de]:23" ];
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIICf9svRenC/PLKIL9nk6K/pxQgoiFC41wTNvoIncOxs";
diff --git a/modules/nixos/remote-builder/aarch64-nixos-community.nix b/modules/nixos/remote-builder/aarch64-nixos-community.nix
deleted file mode 100644
index d3b3c53..0000000
--- a/modules/nixos/remote-builder/aarch64-nixos-community.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, ... }:
-{
- nix.distributedBuilds = true;
- nix.buildMachines = [
- {
- hostName = "aarch64.nixos.community";
- maxJobs = 64;
- protocol = "ssh-ng";
- sshKey = config.sops.secrets.aarch64_nixos_community.path;
- sshUser = "nixcommunity";
- system = "aarch64-linux";
- supportedFeatures = [
- "big-parallel"
- "kvm"
- "nixos-test"
- ];
- }
- ];
- sops.secrets.aarch64_nixos_community = { };
-}