From da0e908c7b58b447ac5ba77c286908abc3bfb422 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 18 Oct 2022 11:02:47 +1000
Subject: [PATCH 1/2] refactor remote builders
---
build01/configuration.nix | 2 +-
build02/configuration.nix | 2 +-
build03/configuration.nix | 2 +-
.../{aarch64-builder.nix => remote-builder/aarch64-build04.nix} | 0
4 files changed, 3 insertions(+), 3 deletions(-)
rename roles/{aarch64-builder.nix => remote-builder/aarch64-build04.nix} (100%)
diff --git a/build01/configuration.nix b/build01/configuration.nix
index f5eef45..66703cb 100644
--- a/build01/configuration.nix
+++ b/build01/configuration.nix
@@ -17,7 +17,7 @@
../roles/hetzner-network.nix
../roles/raid.nix
../roles/builder
- ../roles/aarch64-builder.nix
+ ../roles/remote-builder/aarch64-build04.nix
];
# /boot is a mirror raid
diff --git a/build02/configuration.nix b/build02/configuration.nix
index dd1dc1a..a8f3127 100644
--- a/build02/configuration.nix
+++ b/build02/configuration.nix
@@ -8,7 +8,7 @@
../roles/hercules-ci
../roles/nginx.nix
../roles/raid.nix
- ../roles/aarch64-builder.nix
+ ../roles/remote-builder/aarch64-build04.nix
];
# /boot is a mirror raid
diff --git a/build03/configuration.nix b/build03/configuration.nix
index 47f4fbc..f2dc808 100644
--- a/build03/configuration.nix
+++ b/build03/configuration.nix
@@ -16,7 +16,7 @@
../roles/hetzner-network.nix
../roles/nginx.nix
../roles/raid.nix
- ../roles/aarch64-builder.nix
+ ../roles/remote-builder/aarch64-build04.nix
../services/hound
../services/matterbridge.nix
diff --git a/roles/aarch64-builder.nix b/roles/remote-builder/aarch64-build04.nix
similarity index 100%
rename from roles/aarch64-builder.nix
rename to roles/remote-builder/aarch64-build04.nix
From 6bff0314fe2d14c5b9294ea043fffbee00892fd0 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 21 Oct 2022 09:37:09 +1000
Subject: [PATCH 2/2] build01: add aarch64.nixos.community as remote
---
build01/configuration.nix | 2 +-
build01/secrets.yaml | 6 +++---
.../aarch64-nixos-community.nix | 19 +++++++++++++++++++
3 files changed, 23 insertions(+), 4 deletions(-)
create mode 100644 roles/remote-builder/aarch64-nixos-community.nix
diff --git a/build01/configuration.nix b/build01/configuration.nix
index 66703cb..26f4004 100644
--- a/build01/configuration.nix
+++ b/build01/configuration.nix
@@ -17,7 +17,7 @@
../roles/hetzner-network.nix
../roles/raid.nix
../roles/builder
- ../roles/remote-builder/aarch64-build04.nix
+ ../roles/remote-builder/aarch64-nixos-community.nix
];
# /boot is a mirror raid
diff --git a/build01/secrets.yaml b/build01/secrets.yaml
index bf41715..f3654cb 100644
--- a/build01/secrets.yaml
+++ b/build01/secrets.yaml
@@ -1,4 +1,4 @@
-id_buildfarm: ENC[AES256_GCM,data:wurbDcsLfwjIkif2swmCcM35xYdUgoFRDuFnYmD6YUjRa96wfjec6/IlTM7uWODcFf1E1tPG45fTNGKYtbcegHeR6xTj1EYnz8Mfketyy1okcI5E80BeK+zcDRJyMPt0yHpB3y7bgJaea0yFlBbOsJ8bIr1Qe7IcZ9sovYGFsVZ6yY7KZ7JvQH+kY2UlMaJbIathc8aS3GRdAYVjO6FopO8y421Dn/o6SdM/qswPgmhxdDsXjcxLzv6STeFJ/98ZE2XOKTYe/w96AuXlOEXM3vj7wfjmqk3H/qWim+LCHkvYtPkql+WbsU+O6octITwHkZ6dz0rdFofurybqwbyWC3UE59FvFEV6BnIAeOvn+4lpmhWZHAH+9JxQscxtGxlmW7AH8mfBVtoxBu9YRHRfPR+r6YPDEhCLn7EdlQoJXmKBUrt3UkZSstgwukeG3A4ieGAiW+DkD7m9QdY0OsAzZSkJtauGhbopCWSA7iQOOlYlVFaY65jZY+l1Jg82AgBIJxqB1Vl0Dj/CxUl2LZB+QBaeLb564EqM4v2y,iv:H5vFFf/giiA0IXtH7xGFz+txcAphIl/jsxngJo/kDxI=,tag:fAfUjdjR5D/x+GK0RiwVDg==,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: []
@@ -32,8 +32,8 @@ sops:
YzVzd2pDLzhhSkVVYVFjanpveDg3aFEKeid/qAhJe3Xd9JjNmBli/bXuWRZG6xJW
A/SwH+mIVyldWqYO4At3yIdYYoFhMXWkookCVStZPl1CG+Upcue6iQ==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2022-08-13T15:45:11Z"
- mac: ENC[AES256_GCM,data:2siK3B3NTLfwkHSryGG26DszJ2AjyJtHvLmTPaOQWiwtfWnSli4p0oOmKgI3jeL84078sn+vLkcnq6nLcjBTeDAwUSJqZFm0IyW/fviFx4vjp6fP93+WfHDwqpMMQT+Aocjp1wBtQMK6SpubkFpVXwliU2SlbxSNODRSbfDvaTw=,iv:O4BdKVKA/0G73M9mOe7Vj/Vvt7Eh1vUEE26edPCd+A4=,tag:aIj+XGnbeaiUYC1KRsta2g==,type:str]
+ lastmodified: "2022-10-25T12:14:01Z"
+ mac: ENC[AES256_GCM,data:DEd228eLQ64rkSR+s/KSSK9prArBKlnGK7+b+waOPVr2bwtwFFl8kHDC/hT6euGHpdj1mRF4EkkCV1nWUmMWwFzcoaPLLniX53qELaGY3MmJgkJOnsMfHFotlweiJi9LVztmJjS0wka3Ua/xVB+qETVE2QF8bS7xJ4T02zadenc=,iv:OB0+RoNdBCf5i6/BqyV5gOmgpptwHxmocvX/wojRW1E=,tag:2I8l7ZITTrh1xHx9DctMrw==,type:str]
pgp:
- created_at: "2022-08-13T16:00:18Z"
enc: |
diff --git a/roles/remote-builder/aarch64-nixos-community.nix b/roles/remote-builder/aarch64-nixos-community.nix
new file mode 100644
index 0000000..794e610
--- /dev/null
+++ b/roles/remote-builder/aarch64-nixos-community.nix
@@ -0,0 +1,19 @@
+{ config, ... }:
+{
+ nix.distributedBuilds = true;
+ nix.buildMachines = [
+ {
+ hostName = "aarch64.nixos.community";
+ maxJobs = 64;
+ sshKey = config.sops.secrets.aarch64_nixos_community.path;
+ sshUser = "nixcommunity";
+ system = "aarch64-linux";
+ supportedFeatures = [
+ "big-parallel"
+ "kvm"
+ "nixos-test"
+ ];
+ }
+ ];
+ sops.secrets.aarch64_nixos_community = { };
+}