From 4cb152fb03caa38e9e53cde108023368d81396b0 Mon Sep 17 00:00:00 2001 From: Dustin Frisch Date: Thu, 16 Nov 2023 00:12:23 +0100 Subject: [PATCH] More nodes and deployment fixes --- docs/content/internal/deployment.md | 2 +- gathered/node-07/ssh_host_ed25519_key.pub | 1 + gathered/node-08/ssh_host_ed25519_key.pub | 1 + gathered/node-09/ssh_host_ed25519_key.pub | 1 + gathered/node-10/ssh_host_ed25519_key.pub | 1 + gathered/node-11/ssh_host_ed25519_key.pub | 1 + gathered/node-12/ssh_host_ed25519_key.pub | 1 + machines.nix | 14 +-- machines/manager/netinstall/default.nix | 52 ++++++++ machines/manager/netinstall/installer.nix | 6 +- machines/manager/secrets.yaml | 123 +++++++++++++++---- machines/manager/secrets/ldap-sync.conf | 46 ++++++- machines/manager/secrets/ldap-upstream.list | 46 ++++++- machines/node/default.nix | 10 +- machines/node/disk.nix | 2 + machines/node/hardware.nix | 11 +- machines/node/network.nix | 10 +- machines/nodes.nix | 81 ++++++++++--- modules/dhcp.nix | 1 + shared/default.nix | 6 +- shared/secrets.yaml | 127 ++++++++++++-------- 21 files changed, 421 insertions(+), 122 deletions(-) create mode 100644 gathered/node-07/ssh_host_ed25519_key.pub create mode 100644 gathered/node-08/ssh_host_ed25519_key.pub create mode 100644 gathered/node-09/ssh_host_ed25519_key.pub create mode 100644 gathered/node-10/ssh_host_ed25519_key.pub create mode 100644 gathered/node-11/ssh_host_ed25519_key.pub create mode 100644 gathered/node-12/ssh_host_ed25519_key.pub diff --git a/docs/content/internal/deployment.md b/docs/content/internal/deployment.md index af4a75e..8895eaa 100644 --- a/docs/content/internal/deployment.md +++ b/docs/content/internal/deployment.md @@ -68,7 +68,7 @@ Altering the list requires one of the previous members to [update the keys](#upd Whenever a key, either the SSH key of a machine or the PGP key of an administrator, changes, the secret files need updating. To do so, run the following command: ``` -find -name "secrets.yaml" -or -path "*/secrets/**" -type f -exec 'sops updatekeys {}' +find \( -name "secrets.yaml" -or -path "*/secrets/**" -type f \) -exec sops updatekeys {} \; ``` ## Bootstrapping a node diff --git a/gathered/node-07/ssh_host_ed25519_key.pub b/gathered/node-07/ssh_host_ed25519_key.pub new file mode 100644 index 0000000..4474b74 --- /dev/null +++ b/gathered/node-07/ssh_host_ed25519_key.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEAiJYXd8H6uWs04u/uPJ6P5Tf3jocNZSAfyL/F46T6k root@node-07 diff --git a/gathered/node-08/ssh_host_ed25519_key.pub b/gathered/node-08/ssh_host_ed25519_key.pub new file mode 100644 index 0000000..29dcacb --- /dev/null +++ b/gathered/node-08/ssh_host_ed25519_key.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPP680/jvtq329SSBJO2cg/H/TzavKsAbnoLvyno8gsU root@node-08 diff --git a/gathered/node-09/ssh_host_ed25519_key.pub b/gathered/node-09/ssh_host_ed25519_key.pub new file mode 100644 index 0000000..2a7c82c --- /dev/null +++ b/gathered/node-09/ssh_host_ed25519_key.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINrreB4Hc455b5SAOGTgwCt+FmptQ1kkgIt5HBlDqkJB root@node-09 diff --git a/gathered/node-10/ssh_host_ed25519_key.pub b/gathered/node-10/ssh_host_ed25519_key.pub new file mode 100644 index 0000000..ac6789e --- /dev/null +++ b/gathered/node-10/ssh_host_ed25519_key.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFPelLxDhyyLhD50lfruOx5N1h0215TiSdxACkepOgHo root@node-10 diff --git a/gathered/node-11/ssh_host_ed25519_key.pub b/gathered/node-11/ssh_host_ed25519_key.pub new file mode 100644 index 0000000..d7979e9 --- /dev/null +++ b/gathered/node-11/ssh_host_ed25519_key.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEFH7H5kJw9cI7qodZoDgeRompH6P83Lr0kyT3s7BL1p root@node-11 diff --git a/gathered/node-12/ssh_host_ed25519_key.pub b/gathered/node-12/ssh_host_ed25519_key.pub new file mode 100644 index 0000000..8e8b1b5 --- /dev/null +++ b/gathered/node-12/ssh_host_ed25519_key.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJx0cbAKioikkDHyL0SAzToJFn5g7sV0JY5kxrnJ/nvM root@node-12 diff --git a/machines.nix b/machines.nix index 3d42099..9c20518 100644 --- a/machines.nix +++ b/machines.nix @@ -3,8 +3,6 @@ with lib; let - nrNodes = 7; - mkMachine = { name, type, opts ? { } }: rec { inherit name type opts; @@ -18,13 +16,15 @@ let type = "manager"; }; - nodes = genList - (i: mkMachine { - name = "node-${fixedWidthNumber 2 i}"; + nodes = imap0 + (nodeIndex: nodeConfig: mkMachine { + name = "node-${fixedWidthNumber 2 nodeIndex}"; type = "node"; - opts = { id = i; }; + opts = { + inherit nodeIndex nodeConfig; + }; }) - nrNodes; + (import ./machines/nodes.nix); in concatLists [ diff --git a/machines/manager/netinstall/default.nix b/machines/manager/netinstall/default.nix index 63a9f5f..73d4345 100644 --- a/machines/manager/netinstall/default.nix +++ b/machines/manager/netinstall/default.nix @@ -40,6 +40,8 @@ let --no-root-password \ --verbose + ${pkgs.ipmitool}/bin/ipmitool chassis bootdev disk + reboot ''; in @@ -50,6 +52,8 @@ let "init=${boot.toplevel}/init" "loglevel=4" "nixos.install=${install}" + "console=tty0" + "console=ttyS1,57600n8" ]; message = "NixOS Automatic Installer for ${name}"; }); @@ -57,6 +61,48 @@ let api = pkgs.linkFarm "pixiecore-api" (listToAttrs (map (name: nameValuePair "pixiecore/v1/boot/${nodes."${name}".config.hpc.dhcp.reservations."data".hwAddress}" (apiEntry name)) targets)); + + ipxe-with-serial = pkgs.ipxe.override { + additionalOptions = [ "CONSOLE_SERIAL" ]; + embedScript = "${pkgs.pixiecore.src}/pixiecore/boot.ipxe"; + }; + + trigger-script = pkgs.writeScriptBin "auto-install" '' + #!/usr/bin/env bash + + set -euo pipefail + + case "$1" in + ${concatMapStringsSep "\n" (node: + '' "${node}") + MNGT_IP="${nodes.${node}.config.hpc.dhcp.reservations."mngt".ipAddress}" + DATA_IP="${nodes.${node}.config.hpc.dhcp.reservations."data".ipAddress}" + ;; + '') + targets} + *) + echo "No such node" >&2 + exit 255 + ;; + esac + + echo "Switch boot device to PXE" + ${pkgs.ipmitool}/bin/ipmitool -I lanplus -H "$MNGT_IP" -U admin -P admin chassis bootdev pxe + + sleep 1s + + echo -n "Resetting node " + ${pkgs.ipmitool}/bin/ipmitool -I lanplus -H "$MNGT_IP" -U admin -P admin chassis power reset + + while ! ping -c 1 "$DATA_IP" -n > /dev/null; do + echo -n "." + done + echo " done" + + echo "Reset boot device to disk" + ${pkgs.ipmitool}/bin/ipmitool -I lanplus -H "$MNGT_IP" -U admin -P admin chassis bootdev disk + ''; + in { services.pixiecore = { @@ -68,6 +114,10 @@ in port = 5080; statusPort = 6080; apiServer = "http://boot.${config.networking.domain}/pixiecore"; + extraArguments = [ + "--ipxe-bios" + "${ipxe-with-serial}/undionly.kpxe" + ]; }; services.nginx = { @@ -80,6 +130,8 @@ in }; }; + users.users."root".packages = [ trigger-script ]; + hpc.hostFile.aliases = [ "boot.${config.networking.domain}" ]; diff --git a/machines/manager/netinstall/installer.nix b/machines/manager/netinstall/installer.nix index 3bdd1c9..40ef7af 100644 --- a/machines/manager/netinstall/installer.nix +++ b/machines/manager/netinstall/installer.nix @@ -68,9 +68,9 @@ in ExecStart = auto-install; - StandardInput = "tty-force"; - TTYPath = "/dev/tty1"; - TTYVTDisallocate = false; + StandardInput = "none"; + StandardOutput = "journal+console"; + StandardError = "journal+console"; }; }; diff --git a/machines/manager/secrets.yaml b/machines/manager/secrets.yaml index 73ccc5f..80e0ba5 100644 --- a/machines/manager/secrets.yaml +++ b/machines/manager/secrets.yaml @@ -13,37 +13,118 @@ sops: - recipient: age1ys5pskgkjsgqfy2lr0afcnl2edry8jmryhymkwtked2se74e9g4s23gunn enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPMnRvZGhGSUtQZS9VZnJk - Z2xwOU50eUQyajJFcldEZXhaTDNWR09KbUQ0CmxtL3BZQXRFaGNyNG10UUFFbnV2 - ZWp4dmcyUVZqYkIyRGt6SzFhMnRCa0UKLS0tIHBmU2J1WlJVNFM1UU5VMnF2Vk9z - QnRTVmxBZUJrYS9aT043NTFHNHpDOVEKIVdoYC8TfPlf+Lk1fjCbrANbtHofRlo/ - wF3Cm2jZIPsn/tweTWQewoVh23fgp38Fcj3gZgJwBPf+HVtH4QL6EQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWNlRRZTlsWGUweFdTK2ln + akN3dDB3ci9KTGJwaUsrYmFjdGpTWTRXOVU4CnJKd2Y1WCtGTVBRejMwWmFhMVVP + WjIvUDZLYjQzUmNrc1YxU3J0cFhTSFkKLS0tIFdZQjN0bFFsWHVCbll1RjZ0bSts + OS8raW1Lb2orTXp2TGxKdXNpMVYzd0kK7BE5CQxi71iiXc2cxzr9rX3k9+zaLHyk + vKNa9y+zUb8R4CP3iXLIfAdZjPU/2i21Op7xgMvA5mTzhF8GU9dQug== -----END AGE ENCRYPTED FILE----- - - recipient: age1s3evxsdz6zly5qn4fjfl4py8z35n8penm63uwmq0ge2kx0u4rsdq07cn90 + - recipient: age1ll2utvgdlmg2mrdh7xcxw93cdlghrlfxjj4fqmaxamem6vztsecsmghfek enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqQXFmUE85WjVldTFCdDdn - L2puQUl4QnhNa29GS2NicHdiZzNKMGJLZkc4CndiUCtaS2JsUGxDbG1nQ2hPbWtZ - NnhpRVBOdFZyeXFnUWNndmhRcXBkeDAKLS0tIEVySEo0bXc4RllKSEtyMWpZam80 - REQzSVBpb3lrOVFkcTF6SGtuN0VPRWsKfi/qLyhgOdDwudWztQTRQpcv5ITUEPeS - zFA4aAzsDf91juywYXWsAmUq4L4WusfWb8Cf2hMTQLYLISb3mJXxlg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLeGlpaXduTGtIUHd0bXJI + b0xNbmFMODNHS3ovZ1VLb0FUa1lPQnFseFFrCmdQR2xQRDN4eE1zMmlreEEySFJE + c0VDSGNlZHRrRkF4S3Y2VFRUL0VnV00KLS0tIGNiMVRwNXU5QklmSnpScGpPSlRy + TVc4SDRRc0ltRWkyT0s1V2oxRkZNa0kKcA+NyMDOIj/D0ErAzuY53hZWYoEHanCO + +uxKWP8QtZJBE56e3U1UANVTFh2j7eUAje/QclmJuL+Tu9xSN+1eLA== + -----END AGE ENCRYPTED FILE----- + - recipient: age1ujldj2gprjmqjcn376mtj8chskyk40gvst3m765td8za9qcd2fksuyz2h3 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxWWc4RnBmaW00M0VRWCtR + eklZSGNFNHBvMW4wNXR2VWI5QktIaDdnSEFnCmduOFY1TU5ER2dXdm5nblZ6RWIy + cVFWazFDMFNTS1dWS3U4ZGdNdG83V2MKLS0tIENyQ1U1QjRzV0lqQUlnQWdwQk5Q + S2F1SjVJNDhGNHN6WVIrNmQzMEdKaW8KemYXcSqet2XZUOzG6WTNCMWiu8wDv9j6 + UPv8jevCJDrhPSsqGLbf7bn9Z8Z4NrYOiSrM3OWvwdP832q/U6Ct5g== + -----END AGE ENCRYPTED FILE----- + - recipient: age1e8f629xakqvc6gl25j36d46vl4tqnntjfqv2re54savhtc9ysqrsj3tu09 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKMEVkWmVobkgwdWF0cUR1 + bjRZSWtFaGdBaDZCSTB4QjZLZWtKbXUwajBvCmFvWEJUWnhxdTRqem93dGp6TXdH + ZlowakZyaHQ3VDIyZ01tSC9rZVBxU1UKLS0tIC9FdDY3SUkwNWN0YXFaYXdDMXZu + OWZNTnpZUnJFSWVUWFFGL2VDSVQzS2MKn5y3SGTc4jJNR55l5lQU789zDcGGrDBS + oormb5WXLI5If8Bvj6aaFMleHA+VA6fHUHktlaYZ0l/3cBoXrt1FtA== + -----END AGE ENCRYPTED FILE----- + - recipient: age1lqtfrgk2nfdgqm3tculqlph8r8nthrv7frzk7p8vxurwgwudedqs5s04d3 + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtRXM4VzEzOUIySS9kcUF2 + VDV5aUEzbG1Mam1KdjRLTHNMSGhqTWhDdDNBCnNGYzRmYXNOR3VPOER2NmdHc3Va + UWNzWXl5UHkzbkhURFRVWW9wRVlpdEkKLS0tIEN0WExBVWExaGNOcnpQQTJOV296 + Zy9UK2tzZzRseUZPSGlOUDEzaWxaQjQKKpWGAvpKs+oonIGcKABLvwg6qRm+Y+v4 + aTYPdkhAs0PNKJi1V3Sw/fq1S/VIyKqdxJy0rmkN88vlQINb6M7zxw== + -----END AGE ENCRYPTED FILE----- + - recipient: age1hw95hm8056j7xu2dj96g95zqrnd6end664ws93ekqzv2xj0re3rs6yz0mf + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4QXBxc1hsVjMvTkg2NmpU + b1pXdGg5emlGeTBmRE56QW5STHh3ZG1nekQ4CllwZ1c2WG1VMGFFaFpobm1TZTRT + Y0dqRTQ4bWtnRmhoSmg5Z2tQTVVyN1kKLS0tIDBZbmE4cUhzSmpTZ2hGZDZVWndV + MWZQbEdJTkM0NU1pVVNtTUhJR08zRlEKY8rhGEVDgatRRMrzhPX0FGVtfvMff69n + x0H61ykBaQYjYTtrkk8Zu/ruiDsEaWalD7ib6jL7Rq+qfNjOsDVa3Q== + -----END AGE ENCRYPTED FILE----- + - recipient: age1upmemuj08e27ug0us2stzl7ksmxynqcs4q0dweuhn59w0kfd4vsqr25ylh + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVdlV3OHV4d3phcmdGVk5y + MHh2UWJNcmZueTBWcmxBVkIzYXdsWm5KcUFvCnVzRlg1VkVRYUd1ektlZ2ZicjhN + TC9xS1k3U1FFOEdad3NSenRzVFM0SHMKLS0tIHI4UnFOMCsyZXpNYjAvMzhER0tT + Wm9MMVpXcWxxamc3cVBUejNrMHltSDQKpVwzIX4a52IrEiU0YHHR74jWtHRgoeLg + BXQbhdhHbJWV/BZhmZOLQ+AycD16tJHW9YDpDyf+WGNhLRWru9flEw== + -----END AGE ENCRYPTED FILE----- + - recipient: age1qwjtghh747xx7ssfyq48g9rucnwnfa3eslyk7futw2rqeakeuayqzlwj6g + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBseTIxeDRDV1d6dnZsWXZN + UEhQSFgwcm16WitsKzA3YUlnNFpBT1FxRlVrClJkRzZkVkZZU0cva3lMVUgwTGIy + ZGM4MStXUC9qeFZrZHFrNzRFcEhIMUkKLS0tIGxuVm55d0xUQ0w5UXBUM3ZuK3pz + Rm15MkdqYjlQUFhWajRsL0pJZUVhSHcK8R0fRsp85i52QSGF2QIwuelBjWcs9Nz4 + 4mum9Wy3fX8qKe/DzKshkMNA3/BTl/Yv00/zMLDjrIh3mmsTPiUQBQ== + -----END AGE ENCRYPTED FILE----- + - recipient: age1srvg6f4wa48mzd78jd58z22uqdwn8azuvh2uugr2lhjvpzagsyes3w033d + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWUFB3bmprSmtyTExVUU95 + ZmJrMVhKMDVSUTF0Wnkvckl3QzBTbUp6aFEwCmczZEhkV1lBby9mL29XS3l4U2Rv + dUxXWHJMQWtPQlpubFQ0S0FGamZ1MjAKLS0tIEFab1RzL3JnaTBnOTVNTGxaWEh3 + dzZ1NWZIMklSaUY1ZmxuQUVLY1ZPdVUKJ6ZbSAJV+/KS9YFJqcIuZsQaacuy0T8o + WGNymfHEaOq4JTxeQ2gTU890EeUtp8OUef81qrlpzMtlhPMrciONiA== + -----END AGE ENCRYPTED FILE----- + - recipient: age16kzxr74ns8q90qa6k79wqw6gsmp97cjvs95qcgru3gdsqamwjggsqnvhmj + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxa2didC9VT0JSN2NLZGpz + VjRXYW03OGtFR0JkT05GT2ZvV0FYdysrK2tVCm1CODlhOEdZMm00dm91R2ZHYnVV + T3RtcmFkclp1VmV1ejBuL043WE55WG8KLS0tIDNBTDk4OVZmV09aa2ZrN3RhZWNG + V1Z2WUJMdStwSFpVVkpYVXdhK2I4emsK3odz+QK/HwNqCrvWBE+Thub0fsqM3c46 + 78W1FneIXVhL2aSPp12B766vSsaafXTpWVUCXc4S//GrpLRVvte/cA== + -----END AGE ENCRYPTED FILE----- + - recipient: age1m5khulhawfmn0evg2cne6mtlk58zq0f2qmy55zywuxjg26e78fnq72aq8d + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxSFRHVzc5VS9GZ0lzWk1D + clZ4TTA0eGdmZEdWT1l5aHlpakNYNWdRUVJFCjFDZGd2U0d3VThsNCtqbUpnSDhh + ZklaeEZiL2N0ekc0OHNsQ1N6VkRzK2sKLS0tIFNlcnVyTUhHdEdXQ0dTNGJEeUwy + aVp3a0I4cFQ2eU9wamVJTDJyVWliOVUKmIdPmvq2MPKLJBEat06idpQMRiQkJkMz + FZPukQtDPH4g5d8OD9Kz7uyczQHW6H8BYNbDn+ZV+lzHfKBc4ivrTQ== -----END AGE ENCRYPTED FILE----- lastmodified: "2023-11-04T18:58:58Z" mac: ENC[AES256_GCM,data:fFsTTPmvONkDVQ8mkOxJ6J0N1pbhtUXMspT9svzJYRMoKcEICEocUOEgS3Ucmn7hgx3v4+8prj3BYG1woA2pamgZ5+xI/UsZAOFHg2Wjdqm7OQ3AuK4Qf0uS8LMT9b3dKEddB9S4jVSn9klTou8m7gf1DM6esc2GBKh/zVi+ZtE=,iv:uFIc+S/JIQZHavT5hunvqmZi+zIUxsEj0VCN335opPE=,tag:kfQMv6skdQR/SCyTIQK1qA==,type:str] pgp: - - created_at: "2023-07-03T09:54:56Z" + - created_at: "2023-11-12T16:44:13Z" enc: | -----BEGIN PGP MESSAGE----- - hQEMA5ntoryXZPD4AQf/Y6L/YMf7/WB/4eRdS7bAm1512CGvwfdszYvKIOwmsdzk - uRKKV9IFKl5SRJwFblNBuHyOVymrSIxlqVeQhyIg0fgcVprgipTNJI0s564sCfdQ - Tty8iW2d4XAOQ3inRuQdkYlgmUV4bnT+7kD09Bj5xduBQrQTFhmQfjMRXVCHJ/Ar - n8WAovMfrynevKH4B9sryHjVIosWcqVqd8RYV2yhMRi9+cbnivpsn+W4TXNM1gCX - d+4cNTnSQms5AAwCcP3mnfizWgdVx35j7eGWovKpqj1eUlJe7b4XpwZPJmXItP7n - tq7XqO9X25I52/A25secy7YPHCDRpwkNYUQUMsc6WtJcAXT0+5y516AY3gQKrn33 - mqQIIrfYfgzdJJ1ASG9FdSuLnMiZodKZN39yOYkyEjGE0XWNmdXRqYaMBAZC8Fw1 - dMqkZm7sxY0XdpfC+j837Jb4BaZk25H4QP5oJms= - =aOiG + hQEMA5ntoryXZPD4AQf/ULo1Lyl1DVrdJQXekgluGEM7uDtNxwNSsqGZpUIt2jHv + w0RVlotpoyM/G90cQGkSiYA2NLQLiMFhuY4z8siCy9cBVaDsxR2n772Z5XyZuene + sRhyi2cBlTtFkGfhoKG2JV0n1ZXVVCabNKHXUeH62xwyFS5IfasBAPhciTgWGeam + SjqtgMNEDXRuJVDG2bK4CuqC/DoN2h7STKNF6dfQ40l2U43509mXvmTnfQGoobIB + PVQltEJSLmm2Jym1cGBJa8scpCDXY51aSH4S5aAD69MOQ+9Eqn/TTgROFiAxRHBQ + DtDpGr5T/46zRBaisnK5cPm4Z9YfnUP3pn0xgztOStJcAbRdu6fLup/DOBBBXV4i + 6KwpvTDMpWStp0y9gLleUF92Avc52CUlifgWdIduXromuZHiIiWtGF9EZioW52UM + j6iDd8lycl52fgOlR7OftKcLkSVDgfj3MofS6xE= + =01oP -----END PGP MESSAGE----- fp: 3237CA7A1744B4DCE96B409FB4C3BF012D9B26BE unencrypted_suffix: _unencrypted diff --git a/machines/manager/secrets/ldap-sync.conf b/machines/manager/secrets/ldap-sync.conf index 07de2a0..87f3225 100644 --- a/machines/manager/secrets/ldap-sync.conf +++ b/machines/manager/secrets/ldap-sync.conf @@ -8,19 +8,55 @@ "age": [ { "recipient": "age1ys5pskgkjsgqfy2lr0afcnl2edry8jmryhymkwtked2se74e9g4s23gunn", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvS3l2MU4ycE9idHIwREU0\nM3k0c05idmNqVlB5anVONCtXRWNzckROYVI0CmdhVDkyVGtyczYzTGREVmpyR2g1\ncGtWeDc0Y1lqSVVWV3plZHU2cXVNZzgKLS0tIE1nYWxQL204SFNyTEVGQytJdk12\nQ3NVNHRIMTAyalBoSVBuVkNKWEhzdTgKd5b9zzarSyxl8CAugOVVJzEAG0N2mn70\nxB0PPSzXFv0fILb1h8A5bdDf1snxsbdIAfUWucSX3arCoU5l6LmHRQ==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYdkdkZ0QxNXBOaVRjT20w\nbmFiMzNDSGhXUVRBdW5weG9sZHVRbkYxUHowCnE4OHpUV3dyT3NtQkViazhZWHh1\nam81V05XV2ZMaTJWdnpVZ3VhM2xiZmsKLS0tIFBGUlBDSFhrVzN5UU92dDVpdkZi\nWmU3MmtIZlk0Y1NPWHRzT1BTMG5Ia1kKme7i/4LYQUCV9xvPPYBu+Lxf52814eVb\nH1saeq1nXuRFR/9olWuRlihap7JxcG8QnASSwkhoGGa4C9fi6F4a1Q==\n-----END AGE ENCRYPTED FILE-----\n" }, { - "recipient": "age1s3evxsdz6zly5qn4fjfl4py8z35n8penm63uwmq0ge2kx0u4rsdq07cn90", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHOUsrS2tyTUVEUEZaN3pR\nR0drZ3JDdUtMRHhJaGtONWtwK2Ftc1JsUFRJCjZtYXFubmlpTWtHNVpRU1ZhdThl\nUFVXUERDazdvSGtDOXc1VFNqeTRKRGcKLS0tIDhTdWhWU0dCUUYrZkdSRkVxbGFE\nYkg2Nk42VnUwZFhZVXdsWHFKYnUrMVEK0Aj6aON/QIFT2fsv2D9Ajvu+f6mHT4Q3\nm5uo99snnGEl3VIcvhC2yKGEtw3XOVpCfk5xHYLV2nlSs4WCc2DrkA==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age1ll2utvgdlmg2mrdh7xcxw93cdlghrlfxjj4fqmaxamem6vztsecsmghfek", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4ZzlzZER4enlpMFVVVEtK\nQ29XcDVtRWpJakNub1FwN21NcC91cWwya2pFCkdJc1RIdkVXUGdFK0Q5Uzh2WGsv\nV0w4SWtYOERiRHBrRGVpcklPbXFjcWcKLS0tIEtTV2RpeXRQUDVLVmlCdWxIM1Y5\nam9HcTZPV2wzWVpsWEU1MTM1NVFFUmsKNH3lKKdPju/Sx0FWwH2xDUjff5Wsi/p/\neWY2BO7U8TAq2SC1OVyqiMDx40H4WIOeBLeF13gYb4NDtMoJyBFVjQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1ujldj2gprjmqjcn376mtj8chskyk40gvst3m765td8za9qcd2fksuyz2h3", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2c3JyUi94MmxFMDczVFVi\nd2prYnV4NFRDNG9rU1Z4RUIrK3pUSXNZK1QwCkpobzhFVXJ4U3pvQk91NW5qcDBG\ncjBmSHJkaFR0cGlka2FJWmQ1R1c3KzQKLS0tIEhCVGY4UGpKMk55akJIdkkrUkpO\ndlhMTGxLc0hZTXIxMFc0NWV3SkllaVEKk4FxOPXAoL0v6nFWsEtbZUGno7eFIOhV\nr8gnKqVJKimmhbkof5BPPkTKQ7ieEZQ68YfbAUJVh5eeobtzvwnMUQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1e8f629xakqvc6gl25j36d46vl4tqnntjfqv2re54savhtc9ysqrsj3tu09", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3N01TNzFhMjlucUoyKzgy\nK3Z4L3oxUkpjd0kvRCtSWm1ZazB2RitsZXlNCmpvUEtIR1ZFYWxiZzlVcTF6V2Uz\ndUFNVVJramJXSGpwWWw5ek5JVEZJSmcKLS0tIEZ2YUszdVZQUkxFMy8zUzdDVVdE\nMUhYY0E3bW9TVW1XMVZiMDJsQUl0MGsKmtiKcOC3y3HzRuSiU8ju38+0lRhTV7UU\n0rV61nlMIXnmWkeamtoPnKY7q+hY6SDC7/juUUtJKopwgTgREriTEg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1lqtfrgk2nfdgqm3tculqlph8r8nthrv7frzk7p8vxurwgwudedqs5s04d3", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2WXdlZmc3RDFtWGRrcGF3\nQUdKWVI1Z3dCSE0xMzBDOGFzRFRubktBYTBJCmkrdWRiaXl2VkN2WVo3NGd5M09w\nQW1vTGN5T2xHL2RDc25XVnAzVDJDdGsKLS0tIHRvZjVFSDVHRWs3UVc0S1cvS2pJ\nTUpITWZwTEIwZ3haWEJTSFh6eHF5akkKBQM1VJWdIkcKCNderd5e7QwXU5YfY8H6\nOlGCdcAZSGn78r1d69S43hDvb7CwAVPGD2nPmKMZvwJd3jkWjS2Y0A==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1hw95hm8056j7xu2dj96g95zqrnd6end664ws93ekqzv2xj0re3rs6yz0mf", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3dWZTQ2llVEFWNURFUFBR\nVmpjMGlqb0tPZWQ3a0NFSkpJVHFkSDByN1Y4Cm9yQ09OeEZ6TXVUSXRaeUdtdHQx\nUm8zVnE5MTNzV2wzeWNlOG9PN0lLS2cKLS0tIFpQdVllWHNISzNXMmxPZHAwNUxq\ncUx4b0FpV1U3N0U1ZlBxa0lKTFJrTlkKEwMI9Ylcugc0pty/AfqDTRgfgVQaXwHp\n6K+Hf2dzqftZ7mCyZQmERHxqRw1S6pQWzh9mhUrVNHOPSs9awgiaTw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1upmemuj08e27ug0us2stzl7ksmxynqcs4q0dweuhn59w0kfd4vsqr25ylh", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2UlFUaU1ZRFhsWERyekVU\nTHIrbWpQUzQzL1ZQM2kwd0Z1dy9EdnhLOGxnCldaWThZQ0JuYWpBVzN5K1NMVVll\nWUR6VnVjcU42M2dGQWFJU0twb21OaTgKLS0tIHUzR1dYbmx5dTFBNk5OeW9XbnNF\nbFk3WGJVc0k3YzVReFYwSS9rTDJpQjgKnHZG5bSWK+YONPjPVCzZYFK4ZukTO7MP\nx7/zqO2UyEZdzp5wS9/++THUiM4fTYPQH1w+eh1t1M1X2WOPuh0Xxw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1qwjtghh747xx7ssfyq48g9rucnwnfa3eslyk7futw2rqeakeuayqzlwj6g", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvYzFTM3JFVVdMZXNUVTJZ\nbDh3NDFkRTlUMlZ3dFhQOGFuTXRkSmZKRGd3CnNYUXBsd1FZeFc2eTdLRDVGcnhF\nRjFaRlJuV2dFQnBvYXI2dkwzaFdxeGsKLS0tIGFRMENQTkJmM1BJMnlHUkV4Wndi\nNFRQSEJOaFRFM2I1bGsxS0hJT1ZhTlUKS1bsRNxXI2eTjvgH7Nk/nG3QqRVsOi5l\nqIX+HRoastIVmW6U+T50apYlLHQM7ieDm9XlY7PisNV5DlXA2j7MNA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1srvg6f4wa48mzd78jd58z22uqdwn8azuvh2uugr2lhjvpzagsyes3w033d", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0UHhsa2NZZ3poclM0OXBj\nSDd6eEpXQ3ZLajFCSzRCdnJXRVFTMXRDUTFFCjlLdFFQdjRkdjZqTDV2K2gxSUZU\nM1RtVGJ3ejZWVHVzeFRzVy9wcnVCWE0KLS0tIGdTeCtzcWRWQU1tc2JSSDhpc3J6\nQTlpd3JJdkpYTE9kaDJPWlJTdThwazAK+6d8d4IUg6ZgtNpqrI0HlozSzqhZ7DXO\nhjOBHyZILSaQPTCdrW5Jp9spnM24gLDUOaMQA/OBXBUWVLrIkPqIjg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age16kzxr74ns8q90qa6k79wqw6gsmp97cjvs95qcgru3gdsqamwjggsqnvhmj", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtOWZVN1dINm4rUFN5Qmhl\nTng2dlpSc0VrNXVZYTlOeGh4dEZuY2FHblVRCk0rNFVFTnJxcTVaS1VOMG1rS2NQ\nV1FDWit4TFhUZlU1MjRwbzNJZ2tsR0kKLS0tIEhOZ1hZbjJjSThzVk9zNUFWVHp4\nQisybThOcE52dU5UVHZ6VjF6ajY0OEEKtC0wol587uopJ5f9RjVpVsyk59fLJHpK\nvRWr9tOmRWdwBlD1PKxWUSAmkUusPungV2Xsdgultf5NcSNwLp9HEQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1m5khulhawfmn0evg2cne6mtlk58zq0f2qmy55zywuxjg26e78fnq72aq8d", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5ZWVJcllRTFM3QU14dXJX\nTithVTRrbExNbjl5d1pBKzB5YjJBVHAxTmxzCmo3VHFOMmJhU01oMlJ1MEtFN1pL\nNThtcFd5bXA3TlJIS2lIZll4RHdPbGMKLS0tIDFyU1BCZzFxaEI5bkpMaWh0S2sy\nck5ra3YrUElQcjhJWmlIdzMxU1BDZUEKBLQi37WW26lfEmtQ4ViBiMGPxa/r9hcy\nHXJtKvuDRIL8+0tY5d7OrayrL0fxHxBnQmdYcNA5+v16Ak0moIoTgg==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2023-09-10T09:39:37Z", "mac": "ENC[AES256_GCM,data:IE/GHU+0Mlt5hSOUxF9cGe0kMweuPJ3A8I9C6ZZUMeGPT3XLiaWarlVNw3JwnwQ3cn6U4gHc3UdpVM3Ia5W1Qozm0LB/KhMVfBRNXAWWhYqt33Z6V9rcchtUrb94ET/98mRCeqDbJk8UvniXeSj4edWILZM4xEslccbnncx01GU=,iv:3YiShgapFLiAhBgHsVUyKNrBvvme+WL0Z1xziRLjGkg=,tag:uFbWy1XNrpWACdJjZE9rcQ==,type:str]", "pgp": [ { - "created_at": "2023-06-26T09:22:36Z", - "enc": "-----BEGIN PGP MESSAGE-----\n\nhQEMA5ntoryXZPD4AQf/f7WlPOXFZGMzz/XKT0wU5HyzkdAkZg6uzSWMYeFzuzyL\nFjuAL3b1gQ5ACXwxUaoUtAN4iXdHdVtJDZxqgYiDHoqd4KBG0DtWZUzvgpT+nbcr\nkE1nQnV0Y7GIgpoJFblQKAsCYikbYGhzptHhsYRY7jB5wseOEyaEV1nS4Bh0E8rc\ndAVI8G7XreIU04cMixIqPd7f1gND/E1y1XhqoT8eQXsa43Ozi9BEobjaAXPnCjsd\nOiMcGvIYW+w+kdY2Q0R4SN3GNRt3KJnBVnL/PCuffz5xQxlnwEvS0palQNioGvrN\nfhXG5JO6cdxgExhjcw/HJEdHjl8iCG15NN6Z0ZDhD9JeAUPRivJeq1CvGJlrkD3U\nAANHHBAyQgpti23908tOsvePujOrYu2+OyG4SN5pdPvNCroDPoKTDGBik7ZvK6J8\n6TowTtKHE0xlhgRcKNNT0qYk02kmbbwtgvLuliBodw==\n=BlGq\n-----END PGP MESSAGE-----\n", + "created_at": "2023-11-12T16:19:22Z", + "enc": "-----BEGIN PGP MESSAGE-----\n\nhQEMA5ntoryXZPD4AQgAg4XtwIY2+XvFJzrR8wqNlTBpPGS1S4MmvfdCEhOuhpzD\nZEzDUPLU0hQLRUgX4VPGMBSWbwgbxbxfNC/WBLjJruk/MV4bixbXd/GsGiWvld2F\nNOpC/g653rd+BG4sE4XSDEk3NfwmqBGxQUquYk3lvT69LsucBobFsCXy/AYmEKEI\nJWIaArI8aV61gz3gNhXAPEZGXsQZMXWDislrBDNElGrBOQhc9/6+DkSg/g7hiX0N\nYlih/dKOcYx9p4/CZROdjtBBH5voxtqysFZh2QGce0IqQxeQ5Sa/41LNgwQeTjbO\nU3/2HmlWfWt0Mg+c/YTkza6EJA0P8Wl5RgeGrXDA7dJeASiXzOhG0xV6PTJ5oBZ4\n534fGimP6pIrNaH4vWGnqVsA49S+AXRvkXs+tXyzCg5vKOKhqK7K0evz7jJkhAx/\nj29aFNoiE4hiwNcbc3f2Mk4IClVnHV9mxwaMsv8vyQ==\n=arV4\n-----END PGP MESSAGE-----\n", "fp": "3237CA7A1744B4DCE96B409FB4C3BF012D9B26BE" } ], diff --git a/machines/manager/secrets/ldap-upstream.list b/machines/manager/secrets/ldap-upstream.list index 0de14fe..a46b17e 100644 --- a/machines/manager/secrets/ldap-upstream.list +++ b/machines/manager/secrets/ldap-upstream.list @@ -8,19 +8,55 @@ "age": [ { "recipient": "age1ys5pskgkjsgqfy2lr0afcnl2edry8jmryhymkwtked2se74e9g4s23gunn", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzRXhlTTBXRG01clZSTFpV\na1pTOGVac3JlOVdDRzFyd0xGeWFPbmN6empvClpJa2N5Ui9NVlNoNnFHUHBlSGl3\nVnpGd21zYVBlUGpIR2hrQk5MSXdHYlEKLS0tIFcrS0NpaERzbVdZQlVWY3dSUG1u\nMnQzWVVrOGd5TWJxYUZPZVFsTmlvWDQK44uh8H1soJ14eUxtCfcFpKf91zzYuwke\n6LZD0ugNeU61vGNltdI573Vz5e12+t7rxSd/Jdl9ADlGN1Mvnw4SUw==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDM0VDcUt4eDBMVTluR1RU\nOTdTWVdjT3Z2SDBvWmgzNEVrczBydVVGYlZFCmFWOUpVMVJrZDlTYytoTUhBVUFM\nK0w4WG5sdzIzQ1k2V2Nka2YzOGltL3cKLS0tIE9BZ09UVUwxQms0ZkVicWJmWEZ4\nRGJNSjVNTkZyWk1CUVliMjJ2NVZXb1kKrcCZBaqJdSK5sq4Yfti7Ys9hgnEKB+0x\nEoEDzoPoe/gSW3Xhngo2ewo0Se0MUsNVKk5dvhIpqjUTVJAh14lKaA==\n-----END AGE ENCRYPTED FILE-----\n" }, { - "recipient": "age1s3evxsdz6zly5qn4fjfl4py8z35n8penm63uwmq0ge2kx0u4rsdq07cn90", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxZkJBY1ZIdXYwblFmTHYy\nelZkbEFDU3Z4T05KdWtQVFQrTEc5NUFhdUZJCjd0Ri9rV2V4cmxXVFJUbHQxVG9r\naTZLemhlQnBIdEh3Z0oyV3pPa1JhL2cKLS0tIGVhdkV3d2lEQ3MzanpNVnQrQS92\nL2VZdVpSZjlCQzJQTWY1V1EzSzZvL2sKu4UPoUmkuU60oIKlDgly1D8UjWuKVwnF\nBSUFf+m7ssAg1OK2uYbjWC6/XBo4nmmltKac1sEwALxadU2/kBDu3w==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age1ll2utvgdlmg2mrdh7xcxw93cdlghrlfxjj4fqmaxamem6vztsecsmghfek", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5YSsrWkxYeEc0N0VvVVdU\nN0pLV2RCakpSclpTWkE3TFdrdWRhN0p4TGdzCjRGaGgyY0ZkbmJxazZDelR6S1Zk\nWG5HTGc0Wng0Uk03RTVnVFI3VlZQT00KLS0tIFg1QnlUbnJRMmtJZEhGdkxUU0xE\nK0JXQXQ5MnBaa3ljaHhycGNEVUsyY28KQfl5qAhZ9Rx1v3KLt/wpcNkCpsZx1rxg\nn6smTUUdWQVcUeor6aDxF0q+uWDdGIwdYOyE1mNW+UbrBnDiYQBDhg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1ujldj2gprjmqjcn376mtj8chskyk40gvst3m765td8za9qcd2fksuyz2h3", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMUlpZdXd5bEpCZktOZUtn\nK3ZqK1JwdHNDV2Z5NkdPY2hoSHpSbHhQdVdrCmFlTjJRMlJaMnNGTzl6bnAxU29J\nQnJJSDY3UCtPVktKUm4xL2daUkx5c00KLS0tIHExNjZUZ3kyWUFiQll0elNVVDgz\nZ0plS3ZGZTNkQ3F6M0EwN0NyY2pYdHMKEmd/7vYrkL04YDQ1S8y+D4oawdPFINDQ\n8ymdG/4bgm/LiC8cSnfSiReiWxfxpr6Hu5JwyodguYmCtNEcBGGkPg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1e8f629xakqvc6gl25j36d46vl4tqnntjfqv2re54savhtc9ysqrsj3tu09", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkbTc4UFVNbzAvalRIdFor\nUVpsbXlaMHlRS29UemVZSjI2c2c3TG4xUEQ0CjdvN3paL2g1YjhUWjIxSTRhUEN3\nSVNiT1VWVWRaZ2RnbCtqMmpwTXpVd2cKLS0tIFJNbFNad29LYm5ZVEFhWDBoeHpQ\nRUhvTG1SZUpIYkZsSGFISzVQZVpOKzAKMOX87GzpK5X3YSV1sUafDsq/daOMt7gT\n1xWTCQRXM70rA3b3l8IRy0QQyVuOaJrN9AET8JvApAXAn4Y52YRjQQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1lqtfrgk2nfdgqm3tculqlph8r8nthrv7frzk7p8vxurwgwudedqs5s04d3", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYbUVxaHYzaFRlaUtHV3Rl\nb0ZQaDVtREFnV0NPR0VrWENCdVhEU0Uyalg4CmtQWmU0R3lFc0hka3J6Q21CS1cr\neUNQdFJ2eVhFQkpMUTdweVhsNEw5Tk0KLS0tIDltcHFhdFF6dlY3K3hCb3dlN1Q2\nMmNDbTA3ejVNUTlxWE0yWkNZK3AzTUUKfqmrykOZoJO1v9UM42G4vprUVSwR/Lyg\nARWrou0UrNS/D+FWGxgPUPepcr9Xqk8xqDIOoj1F78I23G+EpZrTTQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1hw95hm8056j7xu2dj96g95zqrnd6end664ws93ekqzv2xj0re3rs6yz0mf", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByWkYwSzNnYU9JczlSNnJU\neGViYi9pb2lBVUtGdDlmNlNTcS9KWHc0MlVzCmZwUXhvSHgxYXVPcHZkSzVDSm5W\nbXIxL0RodFhxcENaejFpckpSblZ5VjQKLS0tIG1rbTNldEI3MXdKT2o3dENkY0Vt\nWUhOb2dUL1BIZHdoWHRXOXFEdzRzTncKI72JQ/Z9A2bH2Qn7CteMRFGflXeQpVsa\nPpGLuKa1sRsqdD7d51MegFs56su7jHvU1xe8nTWi7MvaK2zNEBQdWA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1upmemuj08e27ug0us2stzl7ksmxynqcs4q0dweuhn59w0kfd4vsqr25ylh", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPcUh6T0RFRms0MmNmU09i\nQlF0dHRFZ1FaTzNBZXZWQ0JuSzR4VmVIcXh3Ci85QkhIMlcxNjJDTzhvd3B6bUp3\nVzRyY1YyYVBUa20rKzZMQmt2UGJ3aDgKLS0tIDhSRkpWd0tYSFR1b2JQSnJjMnhi\nbzFQcTNrWTZONHppa2h3dWdOWVExc2MKlQd4kI/a85oLQC2ke80x1akjpp2N4t9S\nkBUzl0hcFl4XEKcJeArKG2xAXr6wMkVljZLM/3wFUM5eDY0yc4rVRw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1qwjtghh747xx7ssfyq48g9rucnwnfa3eslyk7futw2rqeakeuayqzlwj6g", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZSHJmeUdqRHBkZ1g3RnFL\naURoNjVScFBzc1JxNzM4Z3J6MEJlMzUydUdzCndFdGsyZVFCZkxhRDlnT2hwY2sw\neGxjNENXUC9rM1FDSjNmeUxRTGh0cG8KLS0tIHgxRDJnMFlBMTNCeUNRSUJxeGV0\nNkVLbmR0VWYxMVlmL3JDYXBPSDcxRVkKUop771OVNszPDdopbscU9SRxsGp5q7ZQ\nHoy6BaMy1jRrwjl8POwJDmqjCsSPkfmfipTuStduOa9qw1vZ1+Ldlg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1srvg6f4wa48mzd78jd58z22uqdwn8azuvh2uugr2lhjvpzagsyes3w033d", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvUlZFSkpTbzN5dTNNRWRk\nRk9jS20rK2RLWE80MkJGbWVoY2ZyazF0cEMwCkxmemdnV1hpc0cyVDFKbFRoaFl1\nNVFpanJZejlnUVFZZzZaMmdZSHJVUTAKLS0tIGI3cENjaVVPU0lYVWgrVHBvdGNJ\nS0R6WTEvZ1FBQnlqTXpkaHFsTkptNU0KRjLYkjaUBb6bLayGw2YczFFb/6GSeI/g\nh/hUUUYZWBmpyzNt5F9WuSXIQP21s10UFHXXqw+Z+VDZjab+PA1Phw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age16kzxr74ns8q90qa6k79wqw6gsmp97cjvs95qcgru3gdsqamwjggsqnvhmj", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVdlFyVlYxU09qeE1SdFdC\nbWQvSlpTaWlIZzZwbk9vQW9UQ3ViRHFLNFZVCnlUalQ0Wi9RTFhJUG9EeHhXMGFZ\nVy9PMXNWdk45TmVYeEVZR1FsOU93ZVEKLS0tIHpiT3dQdGNhVGRjYVhINTZsYk5F\nZFFQZHZ3NktJcndBcnVPK3Z1N0Z5UlEK5GiYlQ1A9znSamR6DzJsag9ZXUbwTVBw\npcVWTawpTpgAmwsuLoKGg4oEjIav4tmL+D/z0Day+DMmHXHtrEccYg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1m5khulhawfmn0evg2cne6mtlk58zq0f2qmy55zywuxjg26e78fnq72aq8d", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyZVhJQm5NL24vZklMSzFq\nOFh5bTlWdFFhbm1kWVVMUk1zSUFqYTlVOTBJCnByL2NiYUR1WTg3aXBsWk80UVpQ\nUldZNjBoY0Q0cXFwWGRscEhaTEFUNVUKLS0tIDN5dzNzQ3ZWcFlrY2xMK2FFVGxU\nYURSSmVGbERoWVk3dWdLcThsK1JJTWMKhGsuNW9p6hUf73WrRjr2jY+VSbbh0VgD\nH/IkV4HbNCq5xhT2+pweNIv7FVZeV/GgLGZ3feM2mLI2fXixaYeIgA==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2023-06-29T14:33:42Z", "mac": "ENC[AES256_GCM,data:ZDmRDxJPSmWmZL/daV37H1s9kTp5j8/WK0GbQ6JZef9OHWTXrlpUyZWSkh/mCVbIs9bD96WVos4rLX5rDOlIcMiMXEKcsw63M9KcMlLWvjqkK/D+fnhIqAiNwNPwd4aAV4SaS+3UVlucKgQIaSl06ibrEX1/dTg4by17xEIx43c=,iv:V5mN7N1dewLwqnIWKih6Uu/ocKZ1hU5wcoNW1KSF5x0=,tag:7m3KSBREQSK5ch5PZhPLgA==,type:str]", "pgp": [ { - "created_at": "2023-06-29T08:41:58Z", - "enc": "-----BEGIN PGP MESSAGE-----\n\nhQEMA5ntoryXZPD4AQf/QTiDvYzIo69KMIL2Q4zfpusal9NWTdIuHGV9UmgcuwvP\nhfPa4HTXlNWoE/YBBh8AvwQemrup6toH7V+mbsNlUWJXN+Pwj/+0OMe1Cl+X/VUf\nojE5Rkr2PJBcSRW2sEa2RlVhjPALxR8UR6NKc4HkJVvBnJUng7lxOPXSQOE5M245\n3G44tKDIrQIId7naQNh9fcGJksrtJnbYufMdBOJlwwNueeEJ/ovlGvN8dU/s8OzU\nTML0QD+nRM+vz/hKOAU9R4pYO1qxViVhgeOyms5MRgSyWYLy+HsYx4xByGXNcv8I\nJ58NEYgqICkYYUNeVDr3ONsEYN0hL4VSksX2RacqbdJeAVaUtSRUH1kknrN1gAlA\nx2LB/PFFCR2aGsQWYWnBPhjtdVAVy4flUDtTkquQp837hQZZre+xEP4snY05RYdv\nhqzm7g3iZbDO/nRnsEWj13dygzHwGHruVk3T7XqQxw==\n=BGBU\n-----END PGP MESSAGE-----\n", + "created_at": "2023-11-12T16:19:25Z", + "enc": "-----BEGIN PGP MESSAGE-----\n\nhQEMA5ntoryXZPD4AQf/UiSMDzeQ4vjmJjxm8w4CLSYhzjpTyfzcoECOiv5qBSUT\nt8gKf2GsNFtlROcLN9JAyST58crC6T0ZloHcW2pUdB+J4B3Ka9onYLkZyypLz3rb\n6aeWUiG9LAqxnnsnToSrQp8bYFI4cwnUfcYTlWAtRYa1aODTu0XsO7I/EPtzDTjj\noxeBXJoBTQxNlGMCb5Dy6vPy9u50tqYK1H/IpRdJQHx5nIYW5sPJwtR/E9HxjDoX\ne1NdpimFI4Jsls3soZgOpDSjRuZhLdnodD+ZUlyQWt182nqXg/B3cDKzybGVax1R\nlJd5Typi6XR22z7rx0xOInWVLjvSL3DP3YPgsCyAedJeAe1tLLheRQAk+ulqrK0k\n/mQ0XOqh0F7Kv5wq6/pT3GTN81jyTsVwg4Gck0Ffs3LyZj8J40UTNJbf7h3E4gNy\nF0n8GE6fFQI9sf88v5rNUPz9z3+zWgRR05+zLcN7+Q==\n=xTlw\n-----END PGP MESSAGE-----\n", "fp": "3237CA7A1744B4DCE96B409FB4C3BF012D9B26BE" } ], diff --git a/machines/node/default.nix b/machines/node/default.nix index 2ec01da..a433025 100644 --- a/machines/node/default.nix +++ b/machines/node/default.nix @@ -1,4 +1,4 @@ -{ id, ... }: +{ nodeIndex, nodeConfig, ... }: { lib, config, nodes, ... }: with lib; @@ -12,8 +12,12 @@ with lib; ./slurm.nix ]; + _module.args = { + inherit nodeIndex nodeConfig; + }; + deployment = { - targetHost = "10.32.47.${toString (100 + id)}"; + targetHost = "10.32.47.${toString (100 + nodeIndex)}"; targetUser = "root"; tags = [ "node" ]; @@ -21,7 +25,7 @@ with lib; hpc.node = { enable = true; - inherit id; + id = nodeIndex; }; hpc.netinstall.enable = true; diff --git a/machines/node/disk.nix b/machines/node/disk.nix index c797379..10bdaa3 100644 --- a/machines/node/disk.nix +++ b/machines/node/disk.nix @@ -25,6 +25,7 @@ type = "filesystem"; format = "btrfs"; mountpoint = "/"; + extraArgs = [ "-f" ]; }; } { @@ -36,6 +37,7 @@ content = { type = "swap"; randomEncryption = true; + extraArgs = [ "-f" ]; }; } ]; diff --git a/machines/node/hardware.nix b/machines/node/hardware.nix index d42e157..5e6e4f5 100644 --- a/machines/node/hardware.nix +++ b/machines/node/hardware.nix @@ -7,8 +7,15 @@ with lib; "${modulesPath}/installer/scan/not-detected.nix" ]; - boot.loader.grub.enable = true; - boot.loader.grub.device = "/dev/sda"; + boot.loader.grub = { + enable = true; + device = "/dev/sda"; + extraConfig = '' + serial --unit=1 --speed=57600 --word=8 --parity=no --stop=1 + terminal_input --append serial + terminal_output --append serial + ''; + }; boot.initrd.systemd.enable = true; diff --git a/machines/node/network.nix b/machines/node/network.nix index eba165f..485fbb0 100644 --- a/machines/node/network.nix +++ b/machines/node/network.nix @@ -1,11 +1,7 @@ -{ lib, config, ... }: +{ lib, config, nodeConfig, ... }: with lib; -let - node = (import ../nodes.nix).${config.hpc.node.name}; - -in { networking.interfaces."enp2s0f0" = { ipv4.addresses = [{ @@ -21,11 +17,11 @@ in hpc.dhcp.reservations = { "mngt" = { - hwAddress = node.mngt; + hwAddress = toLower nodeConfig.mngt; ipAddress = "10.32.46.${toString (100 + config.hpc.node.id)}"; }; "data" = { - hwAddress = node.data; + hwAddress = toLower nodeConfig.data; ipAddress = "10.32.47.${toString (100 + config.hpc.node.id)}"; }; }; diff --git a/machines/nodes.nix b/machines/nodes.nix index 69604e9..e3db1cf 100644 --- a/machines/nodes.nix +++ b/machines/nodes.nix @@ -1,30 +1,79 @@ -{ - "node-00" = { +[ + # node-00 + { mngt = "50:46:5D:DA:0C:C9"; data = "50:46:5d:da:0b:d6"; - }; - "node-01" = { + } + + # node-01 + { mngt = "50:46:5D:DA:0C:07"; data = "50:46:5d:da:0c:56"; - }; - "node-02" = { + } + + # node-02 + { mngt = "10:BF:48:19:B0:04"; data = "10:bf:48:1f:a6:8f"; - }; - "node-03" = { + } + + # node-03 + { mngt = "10:BF:48:19:A4:FE"; data = "10:bf:48:1b:57:47"; - }; - "node-04" = { + } + + # node-04 + { mngt = "10:BF:48:19:A2:E2"; data = "10:bf:48:19:a2:4d"; - }; - "node-05" = { + } + + # node-05 + { mngt = "10:BF:48:15:00:F5"; data = "10:bf:48:1b:56:df"; - }; - "node-06" = { + } + + # node-06 + { mngt = "50:46:5D:DA:0C:09"; data = "50:46:5d:da:0c:52"; - }; -} + } + + # node-07 + { + mngt = "10:BF:48:19:A1:F6"; + data = "10:bf:48:19:a1:d9"; + } + + # node-08 + { + mngt = "50:46:5D:DA:0C:0E"; + data = "50:46:5d:da:0b:a6"; + } + + # node-09 + { + mngt = "50:46:5D:DA:0C:0C"; + data = "50:46:5d:da:0b:aa"; + } + + # node-10 + { + mngt = "10:BF:48:19:A8:E3"; + data = "10:bf:48:19:a7:5d"; + } + + # node-11 + { + mngt = "50:46:5D:DA:0C:C3"; + data = "50:46:5d:da:0b:e2"; + } + + # node-12 + { + mngt = "10:BF:48:19:A9:0F"; + data = "10:bf:48:19:a9:8d"; + } +] diff --git a/modules/dhcp.nix b/modules/dhcp.nix index e6efa1f..716cba6 100644 --- a/modules/dhcp.nix +++ b/modules/dhcp.nix @@ -15,6 +15,7 @@ with lib; MAC address of the interface in this network. ''; type = types.str; + apply = toLower; }; ipAddress = mkOption { description = '' diff --git a/shared/default.nix b/shared/default.nix index 4fa1929..4137da3 100644 --- a/shared/default.nix +++ b/shared/default.nix @@ -46,9 +46,11 @@ "nixpkgs=${inputs.nixpkgs}" ]; - # Performance FTW! boot.kernelParams = [ - "mitigations=off" + "mitigations=off" # Performance FTW! + + "console=tty0" + "console=ttyS1,57600n8" ]; services.haveged.enable = true; diff --git a/shared/secrets.yaml b/shared/secrets.yaml index c996ff0..c708011 100644 --- a/shared/secrets.yaml +++ b/shared/secrets.yaml @@ -14,91 +14,118 @@ sops: - recipient: age1ys5pskgkjsgqfy2lr0afcnl2edry8jmryhymkwtked2se74e9g4s23gunn enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQd1NpZWtLR09ibjdibHNB - T3dxZ0U4RWxQT01zbVRiMHU2LzhsK3VvL0JzClVmZ1ZrTTI2MmxJOGlzSU1pVVpE - aHdQVDF4OE5xNWhxa2MzZXJjcGYrOGMKLS0tIG9OMGVOTnUxc0hISGg2QnhXOEta - RDJDNEw4R1o4Rm4rRzBrajI4bEJyK1kKNaZ1UPH0o3LHTFjqWsGoGPCB+2jtGxnF - n2OvPt5Rp24QThFwcrdAj9L6TGSo5CSKtUwJR5OWvMY2bFf0ZzyvMw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmLytkcGlFeHViL3kyZXc2 + NEpWVUp2VmhUZ1pPU2hlWEU4VCswVXVIbWlVCnBueEF5MFVwMGdZTmY2RHI1QXJk + K0lOTTluZEg3SjVXZE1mczdxVkNoekkKLS0tIFJHN0NlanRBL3lCZDB5SzA5Snhh + N3l3dXJsUGlHSEtIT2RlN0M0ZENreEEKkzhdENsKcc3PDA8/UPNzITXeNFBC/Wn7 + DYA/lYI6tFO0yYROavsCH/qJQRHGSVzb4NcFVsXSyk6EvEoUULibaA== -----END AGE ENCRYPTED FILE----- - recipient: age1ll2utvgdlmg2mrdh7xcxw93cdlghrlfxjj4fqmaxamem6vztsecsmghfek enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDOGQ3VFQvNFlIdUxaTllt - VmpPc1VtRmtramFJUy8wOGU3cTk3OGF5dlNjClh2cVI4ZVhyM1k4NGZjc3hsc1c5 - MzVQNXVydzVoWDdKZG5BcHhyQVY1NmsKLS0tIDNzYi9KUVpkcmJoNWsyUWJ6T3RI - dWRBVWRaYmp6Wmt3Y2pNWXQyV0lYNGsKY4Pn/jxHZV3rv5ImSxYORPStxyJxQRvq - r1mZyps568LLoEagvooanxoAYRWifFl7BZrEPNutkNHhSmyyZ+Bbdw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpR3NkR2JCdWhIUndRK2hE + eW44Myt0a3M2RHBtUW5wUUF1ck12dWs0VVVnCjBTeGZZN1pzaUNKY0xtcmhCQ2VB + Ny9yMzBLNkN3TDJvdG43TW1TSVhLeWcKLS0tIDBDNnUrU2x1anFCemNkODRGNzlP + TUl2QmpRMTM1dDBSZXorMUVrYUt4ZVkKlm3F2PnAwzY3r90tFF2fgLStkofy9aMk + OmvDH27DC0RUEG1hM0dGUVhCMeeZ5rEw0GnNA6+Yokpehnixhon30Q== -----END AGE ENCRYPTED FILE----- - recipient: age1ujldj2gprjmqjcn376mtj8chskyk40gvst3m765td8za9qcd2fksuyz2h3 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTL1dKUEl1MDFxc1g4bU41 - U2NZQldualg5WEozRnV6NHROVmZUMm80RjE0CkVPamx5TjRZcXo2ZVVoa2JJUVlh - b210M2Z5NzJMZW53RVNZZ0RhUTdzNU0KLS0tIHBKVm5zK3FldEwzSTN3c2FCR2NU - bCs2R3dKQmdvMU42ZEJGRWJhWm9JZ0kK5dt9W69nnsiyHb0KmzdtDraid9AnXl+o - Np+JU91sRkWr1yJekCNk6MpF8neGY6hZN1UufP0TovrqCshMwcaluQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXbUVrOXE5aTluOW82MlJP + Y0w3ODFmeG1LS1gyTjVnR1RRcDJLeHN6OHhNCmlPUUluL3RScDF3ZXU1T2FZeFR3 + aUVDM29UWnlkaEQ3c1krN2VOZ2tEVkUKLS0tIDFLNTBrYnZrRklhRUczSFY1c1VV + bVYwV2tpa2pKTXFDL1M2T1pGV3hPOTgK1YtJw5HLYScVRxmEzbmSps6PxqB+JpRn + zSTrYiioPeCv1PzaHRHS+v/SSUYhX4DGGVDTEYjluRqe/0GNvESSyw== -----END AGE ENCRYPTED FILE----- - recipient: age1e8f629xakqvc6gl25j36d46vl4tqnntjfqv2re54savhtc9ysqrsj3tu09 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwQXdsam12NDFndjZzK0VF - eXg2TFVUM1Z1N0VWQ0FabkNrZVdKTDF2aXp3CnZZZG5ES0JyU0VLYlM2dWR6enI3 - OER5eitEOEhUQlhnY0lsV0lwK2pWVk0KLS0tIGJROHV6aFU0M2tuZE1qL2tiOGZq - SGxWd2NGNndpQWNWbENMWm5VZ216M2sKDH/ZbOVccBsiBErNkHgCy1y9KdjLd/DI - ob9RD7pUf7XMF1sH7weAsQCdAd/M77B17qNp3BJJZYDftKvRPnx/0w== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxNTJSdWJzUko2VlVXZGJk + R3dSNzc3ZEk2WnlnWmZJcmovVmNWZHYyM2hRCkk3VWpHTVluZXJlRFU1algva2lh + c1VDZXlYbkg5Zzh0VmFFdzZnLzdRWlEKLS0tIGphTEFaQk9wN2tVa3BLRExqUGdh + UkFqRXVBSFg4bllyY3BtTHAvdnlDSmcKl1bJkUlP0ndGZE55ykIp9UymLsVORvGr + z8NcpYadiemBiRfzesbBdB6Nk+GLJjoT2JOjDtFwzydG2228k6xd6g== -----END AGE ENCRYPTED FILE----- - recipient: age1lqtfrgk2nfdgqm3tculqlph8r8nthrv7frzk7p8vxurwgwudedqs5s04d3 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXS3Q3Y09Wc0VLNlNXTUZE - eG9VZThsVU1BbGZKZUo3ZmUyckF0NFZvRTE0CnZZVkVDSUQ0OVExOFdwL0RpMjVL - LzArUXl1M1NWcDQvRTQ1NFR1a3FCSWMKLS0tIGtUOGRwcjd2bVdBQmtVVW5paHEr - anY4ODJXZWEyeGNtNXRFb1NFVGhDMW8KprFkCdMO5HeWO3GzqsLR6a8t3W9ilUzs - NTJfB/Eub7My/Pw0FpA4n3WU28MQBPJe65+ikFOlTkrurszqFdmKOQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlMU9ScDcvazFKUjh0bk5X + eE5aeURVZXduSXVYSU9abjNyY0krWFB6a2hrClFUL2dPMVUxbmZHNlNkWDZKNjUy + M2dOZFBieWo5OHRaQ3F4MGE0WlFtS1kKLS0tIFRwN3A1K0p2cUFXQUt6RXpDeFlw + c0g0ZUZsd2RlSU1KQ1h3aE9pZVYzZGcK2Gp4RAWpkevOpztkSAkAtzJtc9A3dIcg + 6Uf9kc+01QhrJYq+SaBTT8kMbGDyfN8KRR9nVZvzORKVxooAX6nTew== -----END AGE ENCRYPTED FILE----- - recipient: age1hw95hm8056j7xu2dj96g95zqrnd6end664ws93ekqzv2xj0re3rs6yz0mf enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByNzEvZFRmMXI4d0Vpck5p - SE1uSXpsdWdWRDdaclk2eE5EQnkyYXBSVWs4CldNR1NRSlZjT1pjczQ1MXllUmFp - cW9VRUNzWHpDbWxEV0oxLzBFYUMzSFUKLS0tIHV1UjZaN1ZOY3pxVk9zblZZWmsz - KzVvSkdoS2tlQ1RSMWxvMkNveFEvU3cKi53Z4YfIP6mxTh/rR8sl16SBqJofXCc+ - oOu7oBCnQQql7Zlk/ZRg2aLPHPtDh2wo14oL6lgJS8YqjG8k8lGPrg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyaUROcElLYnQwaFkzNFc4 + eFdTalVJcCtEK0VzMjNKTG9YK3VhU0NXcW1nCkRycjhTRWRxczg0SjZzVGtycnBv + aEhBS09DdVBybTQ2Z1ZLWkJ2VVMycDAKLS0tIFYybDRiYVNNOHdDa2hSYkVBQ2p4 + RDlHOWtRS05aVWtGK0puTzlzNHVYUDAKJ132MFJESmk4nHCN+nf60qTnF1OQxL6Z + adJH2Jd3aj1WMBAEdPdIRgOrMAdgqsRtLGGepxjVwIqVmAjAZWA/mA== -----END AGE ENCRYPTED FILE----- - recipient: age1upmemuj08e27ug0us2stzl7ksmxynqcs4q0dweuhn59w0kfd4vsqr25ylh enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoMFZ1ZFdKUWFuRW5LR2d0 - SjQ0VjNHVGNMNWRhbG9sNFFzRWk5QU45Umg4Cm1CVG05TmV1VTczS0x2a3JHZEJr - K0pJTWFXREpFTnRuczIyUjhhMGNjOVEKLS0tIGFrSjlYMXBzMnpvSUdGYWtJMjIv - aXpBSmlmOVNaZXR0VEVuaE9CemZTd0EKDz/F6Cl2ERWY8LPQGqT130AYNP4pMdoN - vVRWwo5PqXyZY+vBR4FkzpnaDOSDWHNMT0LDh+JzB0TkA/dI7+zOwg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHNi82YnliSDd3SXVDS01t + bDVVU2NFZ3FwOExzOTZGOWZGdWRETHdBcGpBCmVWVmo2VWxCM2dob1lXY2hiQ0Er + QWo1cHpNRkVnOWtDQU9OTnZqekc2U2cKLS0tIDJocFVSdjl1bzZuc3NOa0VFUnB6 + ckxJeEw1MEJyVWRONlJxZjc3K1BMRDgKp5x6/ImMkLHa2scWDTB1N5mnZnnS2kk7 + 5cGcgKq37wTDN1TkFAw55q9kocl9xVv+H7z2gULGN53pTRP/FEZHPw== -----END AGE ENCRYPTED FILE----- - recipient: age1qwjtghh747xx7ssfyq48g9rucnwnfa3eslyk7futw2rqeakeuayqzlwj6g enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAraW1jdGRkMDlQWXVyQm9S - VW5KcUE2U3UzWFV0VVNEV1lRRG11SzMwSVJ3CmN6STlIODVRSG1ieWY0OTcvaDk1 - RFJtMlNlY1lIWEExcGpWZlZGVmYzbkEKLS0tIDExeUMxM1gzZlROdHU5YjIyUFdY - c01zMTA2dnZlTGxGd0oxYklXMHdWTUkKYjSQ7Y16AXfiLaOwsyV8LFjUtbUJ744A - uxlImBcQnbiPkJY4DRxmtrBrTSzfX1pdepNH8DR0ZpjpI/6bibHEag== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNVmNzY1ZhUlFjWjdxQXpN + YUlmRW9HbjFvRkh4UzhpejZqL0xySHJpWWl3CmtIeC9BVGtFZnhSb1pnbjkzMGFU + TUV5V0ZnVWNBQnA5RERsT2lWS1hyVGcKLS0tIEZianNMZUZCbVlZNno0S3hZRXhv + ejlMSkhIUk12WU5NNUs0Q0YyRHhMSWMKZ1pd0pDffOuecbSwYIxY/rI7oP5Jbem+ + CMZszvo9rPY87K4lN2ihz2q6nlJeZ7plvsy6Z3L80rljCGL+s8OF9Q== + -----END AGE ENCRYPTED FILE----- + - recipient: age1srvg6f4wa48mzd78jd58z22uqdwn8azuvh2uugr2lhjvpzagsyes3w033d + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNTkQ2YVRmZ0xpbGVnUllL + NzBGQzdTQWQyT1JlK284OGE0NHlON2prVHpnCi9BaVVqbmlpVTIwVXIwZld3bEhi + cGJjY0dtaUZ5TUlTcHZIN0pjZkpJTFUKLS0tIFdQOVAvbG5lQStucHJCSklxRE80 + ZE81dXNQNWFDVU5BRXA3R3BqWDNkdGcKrmXKZeOS5mJ2EFH0HSvjddrGa2LhMzk2 + ixtC+Gx7BSEL/iRAhT2dnWWHEVEp2q01p4PccpQXf7LruLc0bzzQZA== + -----END AGE ENCRYPTED FILE----- + - recipient: age16kzxr74ns8q90qa6k79wqw6gsmp97cjvs95qcgru3gdsqamwjggsqnvhmj + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrNkhKK1ZWUHIvckRkWlI2 + U2JyWTRkenc2alppb2ZjWldzMHR0dmcvMTJZCkE0THdVTVQ0RlZvc1ZPdGhaRStY + SGdVN1Bydkd2SmRxSlNxeUNqTWtHOTgKLS0tIE5SMFlEVDNaTExIVWI0RlFwZVdp + UDdRUnJBdEwyb25wRFhZaEs5THpaWUEKdBOL0118aV5jT25wF706Ofe3SHCYT1z3 + h3amX6WpIDxFrkqn64di5WAwoZmZgx2+Ay5LOMNm9mnCXNVuzl4aOg== + -----END AGE ENCRYPTED FILE----- + - recipient: age1m5khulhawfmn0evg2cne6mtlk58zq0f2qmy55zywuxjg26e78fnq72aq8d + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYMGhlcVVuWGVyOU9sRjNJ + eWlLNUtnQUtCRGxBQ0JKMVl4MWZGQTEvOGxZCnRzeUFCKzV1RWJ6ZS9PNUhyaE5H + YlRyZ0J3b2lMVEc3NXBubVZJbkZrTkEKLS0tIGhnRkhoaVE5Vkp0VVFYcjVLTzY5 + ZUVFT2xCRHpiMnBlZjk4QTgyTVJoajgKVi8ZMw0qEW8E3U+gNQmflRsxFJv2o67p + t0wpKKsmq6QsVVyIC8gZlolu7f9A5yCAAhdIue14GVRb5/srmKXb8A== -----END AGE ENCRYPTED FILE----- lastmodified: "2023-07-07T10:50:20Z" mac: ENC[AES256_GCM,data:84PcC2J2peF6ZyEWH4o8gFw1yopC2o7DN5fg2I1+eUQVRmm8WqJbMkIF2taQeJndliEvsPBg6XXvbtJqdTs2L8o4EkkEwK4whbIosFyuVBuI3NRjjc1qswyYHudZa8CAtXPrVXqtD0q5QOtHwlUdGAyoBCpT8x2ZFaeye+JDuec=,iv:GhvwtEQMZlojwi0KoKUAQeuL53a0EFw1h+ysI9jeMuU=,tag:YJ8iYskhY8r3nDJIYxMusA==,type:str] pgp: - - created_at: "2023-07-05T13:59:05Z" + - created_at: "2023-11-12T16:43:52Z" enc: | -----BEGIN PGP MESSAGE----- - hQEMA5ntoryXZPD4AQf+P0suHHym/OGK4CzSYSAI7cZZUzcF1skOvm+IX5nldLMx - TcF7t4x4dfwZmwKs34eVWI37VrULbeoLoFMPH98+VRj10OlOWxqoyl2xpz4cjGfa - LHnugGrFc5O0mKfeEvK5+2bmukzCKZ0ug2I1pifyLItYxMZl9/udX1aDTS/1qN+s - yYV0mZgOb/SV6v1i79CVFsfms0L8jouElx25CWS4cH12scuRURMse9dIuEkOn5kA - hxkIn5sa4ZuE2OqjrVWKZtiQ0P4kpISdbnsBdvMiultnL/kbNM2s67cwW5GPaGT4 - Rksg/i6jZKjNbyNEP+0K+YugT99LzlILtwLnJ7nMVtJeAUpZDQyrPid49r91i78w - i90hVxPWCZdul0Ao6051Ga8vx2z+OTm/wtq4+ZQat2J9p+lKjsECgWFCpLiH1Ljx - Q5JfM0DzYAifr1ny/CgUAPzwpqkjhe8E2njBsdbXBw== - =DcfT + hQEMA5ntoryXZPD4AQf/Y+1A38IDlotZzkcrNWdbgp53aKrU2sqRAe9MqX7bi2rN + hPeVRAYNH2St383aKrF+/0jyl2l+4ZCmbbFtvuNsjBd9/PTlir04yZTwMZNObrY7 + iCOY2a/3k2LtHDYHC4S75ocBHTTRMYCTYnyOOEXdkNrhWS53lfyJOzIw2GEu4o7/ + vQKN1kATI3xAmCQAfBnfRtdfnN7k6ak+US2/0ICexe6xP6qn7LSk+eP3el0KpJvM + j+y71TxCW5uP9zhkdZNdJv3qiiseNCXdBofT2LtmsuVOEr5dKKFL8aLfYb65GyuV + LrrIwXeYANPHoRJa9k11UzBYLc/GakiTZMtiOXd0j9JeAXdM6kdjRDywzPhvlsz/ + jygtyANDq0oFLDkbyQoGCwmcHpxqEbr16P2DqWuM4HteztqOqYWp62DZpzsf6rrY + kpIkUtnYPiAMDM8Z+TSbgDKUkqgFzY7QqyMCP+d+cw== + =ez3i -----END PGP MESSAGE----- fp: 3237CA7A1744B4DCE96B409FB4C3BF012D9B26BE unencrypted_suffix: _unencrypted