From 300327d3b5b01f00a6061cf4ca9d0cf2314c59d9 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Tue, 20 Aug 2024 23:05:02 +0200 Subject: [PATCH] koyomi: Reinstall on AX41-NVMe --- .sops.yaml | 2 +- keys/machines/koyomi.asc | 48 ++-- machines/default.nix | 2 +- machines/koyomi/README.md | 16 +- machines/koyomi/configuration.nix | 2 +- machines/koyomi/hardware-configuration.nix | 14 +- machines/koyomi/secrets.yaml | 82 +++--- machines/koyomi/services/hypervisor.nix | 10 +- modules/ssh.nix | 4 +- secrets.yaml | 292 ++++++++++----------- 10 files changed, 238 insertions(+), 234 deletions(-) diff --git a/.sops.yaml b/.sops.yaml index 209d8be..56000dc 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -19,7 +19,7 @@ keys: - &shinobu 28677f2e3584b39f528a779caf445ebb39c882b7 - &nazuna 0b8be5d87a10a0e68dda97212c4befad1f9e915c - &yuzuru a1ee5bc0249163a047440ef2649e770ec6ea16e4 - - &koyomi a53d4ca8d2cf54613822c81d660e69babee42643 + - &koyomi 1f18a57e1d4e6716aed0e0cd71586b7a4c0c1a65 - &ci-runner 20e376b89b30327fb82f12e8e8b72d52c3aa39ee - &hiroshi 2b9be9660662c6c979ca1149c982bdfd82863d09 creation_rules: diff --git a/keys/machines/koyomi.asc b/keys/machines/koyomi.asc index 15e3005..41f9381 100644 --- a/keys/machines/koyomi.asc +++ b/keys/machines/koyomi.asc @@ -1,28 +1,28 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -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 -CxhNpGhTpzl96WA2WsNP9Q== -=slmv +AQgAFgUCAAAAAAkQcVhrekwMGmUCGw8CGQEAAOOdEAAL1r+OcspofLYAnefX52uU +CMnBOIK00CuOi+Bg+4gRNTEeed7tOKf9RqU2AArzkRrJindflSnkCe088/Qfw/ui +HXs0hGewcp3i/v5SW0MJI5fZox5hSYTKkfUswgwNf8ZyzFdnxYyIXR2dfWiTo8Uv +VcAe1n/rIe7W7T6uKsrdlgYs2iT7Gbo4Txned2nl8Zq2lE7qzpbksqOV1iy+I0RS +CIyV7PRBQfOIC+rIRPeZD1tOxD2PH4CJPW9jwmM9E42/7gcu/cJBN/MP2vUJS8/l +sbvOT2pMqOqrJRXrmlJE2zNyQK1gJeYdhtNN+8INYoy29yeyvMnaSaUsXpjEb76E +jqvYeFEF6LR2RAQJ1HdCQCGianrFcqpDq7pW1fs+TB+YSFcXUEsNdIeIwROP0hyG +usACFHst2FfYVEd3uz98EHMrgVz3sw48BpK3s8aYVdaRAU/L6lljW3a+6+oAPjMJ +6z6yfgTXX5m+ZwdBCPyF6KlRtZNZQTwqmsULcJcb/fLNynZULRSA3TW6rDhS4NXb +wRF1OSwMMTqX2svuqKlZQhOfaa7w9QL9A/Y4Fa3lZoQOGSdT2+/e0d+MD2T4JqZ6 +3fC4XIqUkhcgeOsfJ0WOQdxm/RRhz8pwQhzUAjYk2jG/JmaYUCVaMugJSLBjXN78 +JKqniA3Iyr5AP2yBxFt9Ag== +=yxFM -----END PGP PUBLIC KEY BLOCK----- diff --git a/machines/default.nix b/machines/default.nix index 89725c3..e754381 100644 --- a/machines/default.nix +++ b/machines/default.nix @@ -79,7 +79,7 @@ in koyomi = { system = "x86_64-linux"; extraModules = [ - hardware.common-cpu-intel + hardware.common-cpu-amd hardware.common-pc-ssd ]; diff --git a/machines/koyomi/README.md b/machines/koyomi/README.md index f6d5d36..11d9a5d 100644 --- a/machines/koyomi/README.md +++ b/machines/koyomi/README.md @@ -8,12 +8,12 @@ SPDX-License-Identifier: CC-BY-SA-4.0 ## Hardware -System from [Hetzner Online Serverbörse](https://www.hetzner.com/sb). +[Hetzner Online AX41-NVMe](https://www.hetzner.com/de/dedicated-rootserver/ax41-nvme/) -- Motherboard: FUJITSU D3401-H1 -- CPU: Intel Core i7-6700 -- RAM: 4×16 GB Samsung [M378A2K43CB1-CRC](https://semiconductor.samsung.com/dram/module/udimm/m378a2k43cb1-crc/)/[M378A2K43BB1-CPB](https://semiconductor.samsung.com/dram/module/udimm/m378a2k43bb1-cpb/) (DDR4 2400/2133 MHz) -- SSD: 2×512 GB M.2 NVMe SAMSUNG MZVLB512HAJQ-00000 +- Motherboard: ASRockRack B565D4-V1L +- CPU: AMD Ryzen 5 3600 +- RAM: 2×32 GB Samsung [M378A4G43AB2-CWE](https://semiconductor.samsung.com/dram/module/udimm/m378a4g43ab2-cwe/) (DDR4 3200 MHz) +- SSD: 2×512 GB M.2 NVMe SAMSUNG MZVL2512HCJQ-00B00 ## Setup @@ -24,10 +24,14 @@ and a rescue system that can be activated before a reboot. Additionally, there is also a *vKVM* rescue system, that boots a hypervisor from the network and runs a VM which boots from the physical disks. -The rescue system can be used to start a kexec installer generated by [nixos-generators](https://github.com/nix-community/nixos-generators). +The rescue system can be used to start a kexec installer provided by this flake (`nix build .#kexec-bundle`). Ideally, everything goes well and the next reboot works, but in the case it does not, the vKVM rescue system can be used for debugging. +Even though the Hetzner documentation states that all current systems have UEFI enabled by default, +my server did not boot when configured for UEFI, +so I used MBR boot instead. + ## Purpose Hypervisor. Exact scope is to be determined. diff --git a/machines/koyomi/configuration.nix b/machines/koyomi/configuration.nix index 34fa005..1d3dd01 100644 --- a/machines/koyomi/configuration.nix +++ b/machines/koyomi/configuration.nix @@ -18,5 +18,5 @@ networking.hostName = "koyomi"; - system.stateVersion = "23.11"; + system.stateVersion = "24.05"; } diff --git a/machines/koyomi/hardware-configuration.nix b/machines/koyomi/hardware-configuration.nix index da29334..7c3c879 100644 --- a/machines/koyomi/hardware-configuration.nix +++ b/machines/koyomi/hardware-configuration.nix @@ -11,7 +11,7 @@ boot = { swraid.enable = true; - kernelModules = [ "kvm-intel" ]; + kernelModules = [ "kvm-amd" "nct6775" ]; kernelParams = [ "ip=dhcp" ]; loader = { grub = { @@ -19,13 +19,13 @@ }; }; initrd = { - availableKernelModules = [ "aesni_intel" "ahci" "e1000e" "nvme" ]; + availableKernelModules = [ "aesni_intel" "ahci" "igb" "nvme" ]; kernelModules = [ "dm-snapshot" ]; network.enable = true; # remote unlocking luks.devices = { koyomi-pv = { name = "koyomi-pv"; - device = "/dev/disk/by-uuid/9145417d-e8f5-4aa9-a526-419e507c47fd"; + device = "/dev/disk/by-uuid/4907ad59-e6cf-40ed-a0ff-3dc09c0c7a50"; preLVM = true; allowDiscards = true; }; @@ -44,14 +44,14 @@ fileSystems = { "/" = { - device = "/dev/disk/by-uuid/3b31163f-4fec-4e1c-b311-7c8aaca76cd4"; + device = "/dev/disk/by-uuid/4b4efa64-e571-4937-bb1c-7608e9d7630d"; fsType = "btrfs"; options = [ "discard=async" "noatime" "compress=zstd" ]; }; "/boot" = { - device = "/dev/disk/by-uuid/12CE-A600"; - fsType = "vfat"; + device = "/dev/disk/by-uuid/83e67d66-ec76-4c9f-8796-1165cdb5362d"; + fsType = "ext2"; }; }; @@ -71,7 +71,7 @@ name = "eth0"; DHCP = "yes"; domains = [ "sbruder.de" ]; - address = [ "2a01:4f8:151:712d::1/64" ]; + address = [ "2a01:4f9:3051:39c6::1/64" ]; gateway = [ "fe80::1" ]; }; }; diff --git a/machines/koyomi/secrets.yaml b/machines/koyomi/secrets.yaml index e54ba17..f2199d9 100644 --- a/machines/koyomi/secrets.yaml +++ b/machines/koyomi/secrets.yaml @@ -8,65 +8,65 @@ sops: lastmodified: "2024-05-11T21:49:03Z" mac: ENC[AES256_GCM,data:yS/v+NWiLlFLTwnbhaYVg98H/ThqW5r+3eC1YsvJRRrF/yZBk6nUtK8CT4tvR9PUeks4a2H15/5aY2oDxnABhXhkbasZjnl3+YGF8SOIwo+YuWJ5A3rHJZQMJGRGg8dwh4xkJMDJKb2Or1uH3ZiSclVMQDiM3RGVifLhtv+gJEc=,iv:ygTcKqU5pzkOoGUx9xw9BzWJx15t28w3tJVH4eAdxS4=,tag:F5/8SSt/eON9zwWGGUyUEQ==,type:str] pgp: - - created_at: "2024-05-11T21:48:51Z" + - created_at: "2024-08-20T22:33:06Z" enc: |- -----BEGIN PGP MESSAGE----- - hF4DLHeEFiC484ASAQdATNhq0wu5gLVG+7PHCtdQRxgC6GqQrvrttZnN3AvnZ0ww - qBdXl+6qkWHyjvclklzcNfpcMD7cmRwRDSDSQASmSTAyulBbgjDuou9Tjl/Rxorl - hF4Dub78fMESoMASAQdAIhgR5ZyuaP12Mav7NNapUcWrScnmjNPh46oX2W3jDDsw - in+hRRYC6apDKMcC3IFEzo6vy7OfhEeMR2IthtU0Y+bgdfjpwEOZ4J5CLg2ERZO+ - hF4DM6AcvgVUx2MSAQdAKc70+YldBMdetkmcWWJYDSUbewIJOrDCJBS+TUTQ2hQw - dq03NJuiqwsrN1YBa1qHELTJj7CvrxTvVSQvDpSEwD3WVk8Qn5z1lMgBrivxCGa8 - 1GYBCQIQj3MkZci7qGULIHivbsOSwX6a3T9JQRkmHylyzZDxYRUz3TLhNvjuly58 - TxBJcHkDmXDP5T+UACrryRIN2h/J/+gw6WkHnPJOcs5JFqB9uneVwpW1A3jNMhRD - iXDXWxIe5PY= - =zp+l + hF4DLHeEFiC484ASAQdA059TryQI438sM8HUkXawVy/b05ZXpRuhJwe7y7nwEjgw + +weY4cgFW4vA4dboZfh1ZNTCkqtRFdeOEe7PoP0cAlafqOs4zZu2sgHlcPKYDeJN + hF4Dub78fMESoMASAQdA9f8/bT94aLGvEBuNn11BhGjsTWyU0mKJugMQRCo55HYw + d/h7PEKHl2GZWydF3lWTKx0cfLDpywmMBary7PtVK4lFYuDdlXodWC85I6UPe8wp + hF4DM6AcvgVUx2MSAQdA4AKcSfXJei4vmFQ4DF7xzAuA530Cb7rWpK4AE38ByRow + jFako55pUboMSdXtnC/bzy2cFeuRxT0mGMXgLbDri02/nxG+vljeFYJyozb6UXNp + 1GYBCQIQYmT27KaMqjQq6zFSr1zKEO+PjBH9rCZTBpsCULNxqOMn+3IE7XoYtdPv + WVU7zZYaK21JRTbnWDjikdvJe60bSRxExIJX35vH3hczc3WP3V/LqQy6X8Fd81pw + pcbiSfWOTXU= + =y7H/ -----END PGP MESSAGE----- fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763 - - created_at: "2024-05-11T21:48:51Z" + - created_at: "2024-08-20T22:33:06Z" enc: |- -----BEGIN PGP MESSAGE----- - hF4Dub78fMESoMASAQdAs3PQ1mkR/MS3vg1qCTPiQihx7yZvQlqlhYRsRigJDiEw - WuZYC66MsLHi2YQEkFoxG0bgt3sHkVRlq72ae713UzfWiI0Dl59dxtGcOtvdo5LK - 1GYBCQIQIupCIS36+zkecqWl1h55C0G/bC+SHdwgp5nFbva+3fidastsvakUDuTW - dGOLK1FC2xUrct/rLGBmWA48fSOA/VJiiEVzP0TsVCytTx/Y44jm0f5HC85LNnNy - 8GoFUoOn6tE= - =A7C7 + hF4Dub78fMESoMASAQdA1W7CmVHBJD/yJWyGvT6lGEXIhsC/gp0XCoHu672OfTMw + OBqitpHTrHyIN7qmexL9YpGsfPtwRGu6hb6lUsWj2+gJ1Pynk6iGM8kwUxGPnj8C + 1GYBCQIQnO/cJgEhybp/i1E6l4i9IG7cbWupNTp6uJ7Ag8EB6cvUqAYN5QHpM2/D + FYMJRh4skIB2LzG2lxPyOOR5F5FQ2j/Rtf7SoCeEidWOBhGPQPBSNQOTE+43zwKo + Z0pnq864C0c= + =btUj -----END PGP MESSAGE----- fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0 - - created_at: "2024-05-11T21:48:51Z" + - created_at: "2024-08-20T22:33:06Z" enc: |- -----BEGIN PGP MESSAGE----- - hF4DLHeEFiC484ASAQdAK53bLfsn0k8SFw/88FliX2Yaev9oMGmKSR7f/6vJmH4w - pZxJqMwkpWt3We5DAkN+VFuawOzPNrV0vmmd8StlajZ5GIaz713QJQ8cpVrE/sPh - 1GYBCQIQUuj0dgOWLtcB/w1vHj0qQW8LnMG5uVY7gk+hPmllQb8TJ1aRUkcPrKoE - rXUCl17BO59C4AUWLu/0RviAki6FMZC1S0g1z8eOck6CFSnW4i4uMB0g5Yi5kqpK - K0oWZqedIzU= - =Z8wz + hF4DLHeEFiC484ASAQdAsGJfau7e9h38vm5srU1s9vdvYrCUJanDhM6aTjVQU3Uw + jplWFk/1aNsEAeA2yIydiyw/wzY8h+QGrcfDTNViw6Zwq2kRvVp5t9IW1k1IteO3 + 1GYBCQIQWrU3Y1SLCA6tV0xLCUeyZbUrgnCgJNUceRHmSV0oi3jMLEv0YUfbf+Hl + VIDfM6RZQeaY0WVLAuFnIEYFJ1RhXgv9nFo/3txZw3WYx3kjKPPRacmoHMturD+1 + Ay5oemXyWMo= + =dfVv -----END PGP MESSAGE----- fp: 403215E0F99D2582C7055C512C77841620B8F380 - - created_at: "2024-05-11T21:48:51Z" + - created_at: "2024-08-20T22:33:06Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA2YOabq+5CZDAQ//beLzskyTj+PN79rvrupVY5gwWxIhYuoRs2ZkJSlNyRYg - exNxwPAjssi3yKoUOy9TNbxzOKP5VwehnOPlJ4jyVgdZ9zksJH9k0WnfhlmabHeC - UnYsUSDB7VUFrpacdIKjmFM6OPlu7Xm98RwSabkmlHEE/voF/Ma5yWT0c3Sx2lzv - ucNSCqmjY0D6S5tJz+3nYsT54OjS+Jlr96CPOR9dz1jEGGQMfwyMxwMLhVpVBDKE - uusl5VD3jw50wYbkhvYscGGkdOkLwAFMIwYvw1seYFTb3kux8ChahYQ3QtPn3ZUD - OoPqYUtgpcnZTAcMGvzL7B0OwJLsCpin454yko56KV/cnIHwSv2cyfsQB0M4dz6l - OalAS5BpqhZ2ulDm34yFlRE7MD+H12tOzBJIFjGQksv9DiuRyezZnevBqlOdott8 - cSDfO3RD3wGdUOIVwi3B92N5j1w39d2wKoXa19kM66mzsdbQrXwmxKa8gQMkjsG9 - Ds2sUwQlKZ0HvvNkJTJ+NORWKKvwGXKqVPwOTUaZjzQGUtVWg5WSjmFoPQ049nqf - gLYhy0OeyEAIRe9HjNo5YANPNBF63qTT2++n6xs2ErXjHNNi85yUnhCBqRRI3Od6 - HkLlLQN3i6RdV5C1wJwu3k1N6a+dl03gFgO3PSJZaLpIhHJuOJwYT3rCGi3ZgzXS - VgFycpleRMSCTjEIY/Ky4PJOlbUykf4CuFWnvJLSOcqjPbozzqjUaw4xzea2Lloj - +Io3l0AHWqKCmv4qbZxim37YuicyM02A56pk7SMKXOuqbb1m5hBr - =bvPZ + hQIMA3FYa3pMDBplARAAjkLNlHDhqSgxY2IbP10Rx+KlATMRBqzDq2Wx+gdBuWB6 + uwGX0Lk1FbcqnhGtUYdtiQBU+7y08oSZ0iFv+tOxTBEGjVBcdUQBjYJa0x1X0kcM + xSfY86bxuJAlvBQJWv7iqdwHPks3DhkePqg8sNwSXUA4wk/L8/JAVnkhbqJ9Am9x + VLJk5xjlFsJwyRMoGui8SDogdc6Voe7zValQXVU5b93Z9klO67dFBEL9nfkUNqhr + mwu0QNRMZGQYE9OYlt41kVRy9x8lATm9J9j12MsEnr9R/8viJyBURHwx+DerRsa9 + tJCf3UgJjcK1F54DTGg/ethCOtYDAGF//U0rU9Fcgwff9axZr6fDqUVHIeeE0GAX + 7cs+yR5Gp+szfEshm4rSTZPOjZB7xVciCUEIKhlXm2y3dL43idWWYj/+50BMUt1p + HhizkrbsyA+JiAYSE4T4uwOLVoU/jOpecQnn25hrSHX8OoSIIUiaLWFnNMvwobcq + 3ummmjAUQ6nxhuO6NQMogrihyqOusidxlBcT7FcP3+V4seo3Co3IlmsCi1w0HmSf + SzLPtJoIaDcDCSVgnlINzfPT9dvDeTOppgUjHMZjbTZDGdUc+jEXb3P/IIqgjrJi + XYtvleP3aoQ84GI3SMvpqwqUfd8kkzvVatGrjA55knQq9HA2o+oq5k9nJnOwEjHS + VgFz6zGoYcr62vaAiBVaSR8ozVQpGjNpq9iC0VR3wpz2J7k9Y8XM+5e3amR15Fm7 + lPV3ZBl7OUxTURxnfUdECdmf+19gObsJsiu5WTsVNYsqMIG8nDR/ + =pbOT -----END PGP MESSAGE----- - fp: a53d4ca8d2cf54613822c81d660e69babee42643 + fp: 1f18a57e1d4e6716aed0e0cd71586b7a4c0c1a65 unencrypted_suffix: _unencrypted version: 3.8.1 diff --git a/machines/koyomi/services/hypervisor.nix b/machines/koyomi/services/hypervisor.nix index 2d31e42..7f175df 100644 --- a/machines/koyomi/services/hypervisor.nix +++ b/machines/koyomi/services/hypervisor.nix @@ -5,15 +5,15 @@ { lib, pkgs, ... }: let guests = { - forgejo-actions-runner = { + ci-runner = { mac = "42:80:00:00:00:02"; v4 = "10.80.32.2"; - v6 = "2a01:4f8:151:712d:1::2"; + v6 = "2a01:4f9:3051:39c6:1::2"; }; hiroshi = { mac = "42:80:00:00:00:03"; v4 = "10.80.32.3"; - v6 = "2a01:4f8:151:712d:1::3"; + v6 = "2a01:4f9:3051:39c6:1::3"; }; }; @@ -47,7 +47,7 @@ in networks = { br-virt = { name = "br-virt"; - address = [ "10.80.32.1/24" "2a01:4f8:151:712d:1::1/80" ]; + address = [ "10.80.32.1/24" "2a01:4f9:3051:39c6:1::1/80" ]; }; }; }; @@ -73,7 +73,7 @@ in # Force static configuration dhcp-range = [ "10.80.32.0,static,255.255.255.0" - "2a01:4f8:151:712d:1::,static,80" + "2a01:4f9:3051:39c6:1::,static,80" ]; dhcp-host = lib.flatten (lib.mapAttrsToList diff --git a/modules/ssh.nix b/modules/ssh.nix index 1e0a9d4..e6275df 100644 --- a/modules/ssh.nix +++ b/modules/ssh.nix @@ -89,11 +89,11 @@ }; koyomi = { hostNames = [ "koyomi" "koyomi.sbruder.de" "koyomi.vpn.sbruder.de" ]; - publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAZVoGK0JNltzqVWN9dejWMkedfzcipTv6iX52HTHaVz"; + publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP6KAN4FJoCLciJ14W9dSbfsObc8GLIP/dhG5kHiHm8B"; }; koyomi-initrd = { hostNames = [ "[koyomi.sbruder.de]:2222" ]; - publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINPQuXX9EJXcz7wkG/yDxrZVODaitAQ1lfGzedNrYKhI"; + publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGx8YpnM1pNBIbqkfYpUnSv8VZihBItHQpCrhZ8ixlK1"; }; ci-runner = { hostNames = [ "ci-runner" "ci-runner.sbruder.de" ]; diff --git a/secrets.yaml b/secrets.yaml index 80e5e63..bd65fda 100644 --- a/secrets.yaml +++ b/secrets.yaml @@ -14,204 +14,204 @@ sops: lastmodified: "2023-12-28T16:12:09Z" mac: ENC[AES256_GCM,data:f7gcMjAEMU6uOeS7x2zvtyu+7DvPOCbtBy+zStALFou6B2rMBuqzJC1CynFh1f+NAKGtv1P3sMdag5Es5xsRHjFqQ0FfWceAB2anTsqW3ZLu+ZKS02p03lR5Tz59GQgS1MHcNkEovY2qZ/Mk/BODJzKYjqmb7ItjXTcSAGII5vg=,iv:gZE0w3Ih5x8xJ0x7sU+ZWo289PIaBUn/y8y78QDqidQ=,tag:cxlGk81xQGifm3IyE5ypwg==,type:str] pgp: - - created_at: "2024-08-20T16:30:04Z" + - created_at: "2024-08-20T22:32:59Z" enc: |- -----BEGIN PGP MESSAGE----- - hF4DLHeEFiC484ASAQdA5RDviFrKzXBWb4Fb5MSQQTCWHGcBNWMYh8BVwesqFAgw - h/zqSbsmq2FuY3RcjqgqkvdQ895V7DDAcLMc0TltgFgse3Ntsy1UngPeedc9n/ro - hF4Dub78fMESoMASAQdAtOkCsrgFk2bhQjYKGUZpwITMRqaC0kqdMRyS0k6BT0cw - 700mAYOUL6ocWHaW9h8u2bEuA6pE94EWl4wKk0KReUhTqpm7E2QrZtIWGTrYVftS - hF4DM6AcvgVUx2MSAQdATS4dM/4EDZ9O93ce8d7mlbemLB0y8zf4YrKetK4bUl0w - KOLoa+nswDbPQs/cReHKxPCSvqAiKZFl6RtNEwwNn//2c/NuBMx3GwDiWHiWVYOr - 1GgBCQIQ3gbFxVWnEruuTaKyP9k13HgAUrURlchV8ceI9yBNkTZfJikX2AMii5jU - yOj9hKReWg9CJ5XxCKVlEzaVNIkjzc2sWZdyX4UzgXySvZ3XA33LM0NEFxjwFBKt - dFHyFR4cKvmMVA== - =hPHB + hF4DLHeEFiC484ASAQdAFrkVwdgRZXKc/acSJVqXZfNJ9VaA/W7cYHSSC9aZ1w8w + k2edqP8gtuHPBYLrjFaaDz/d1dPy9dVymFFmp8AJ3Qo92y5on5xLEerPujYYb3cX + hF4Dub78fMESoMASAQdAU63ToAm4bKdFQYWAShN32Gq2W1jmqebw0f0ZG/cpXm8w + pocyMFI53mSA3WL2VmQcMKHRMyf1qitdZKx+3iJgyc6NApuez68nGXupg52/48j2 + hF4DM6AcvgVUx2MSAQdAMZPou/8fugVQrouLi4kamJ4L7BXvqWedtnTXYA2Pb0ww + FDBRwh+XFSLr8IwuPtFs7lMnlfi31xrU/1Akn5FVdIADlD05SJZJJnKmUfchPkD4 + 1GgBCQIQwqjdcXmPuFI/ZoMJzcWBmvqu9gt8cgAmgMygUcerp28YygrD+gMVAlFi + Dwzj5Zxj16hG6fnLTw5BTV2yIUWZOxZ6RBOwOo7g7iDc0l3f4qdRMFQJpK6BW2KZ + /qOTDJFVxLHmbw== + =ox32 -----END PGP MESSAGE----- fp: 6CD375BD0741F67E5A289BC333A01CBE0554C763 - - created_at: "2024-08-20T16:30:04Z" + - created_at: "2024-08-20T22:32:59Z" enc: |- -----BEGIN PGP MESSAGE----- - hF4Dub78fMESoMASAQdArZqYmbz/ETvzW8is10bDWKwNkY6L65+LaC0gaZ10T2Ew - Rc1jLDxjsicpiri/LGw8yCoKfKZdjv2CQ+4n3/WNCnM9glWA7ZsRtGVSGIq7hd/f - 1GgBCQIQvhwMS4Ug+5VX5TZ0Z39FzRFeKpKECtXTb5N3yTh1Ax+ksaYhcGKGSpw9 - zofqOjdzmaL8xO65xLLoLN10GYQBlDZfWZ7z+Iam9uK/ZXysA6M3WW4xmHNOp4GN - EO4VDYTv74Zqkw== - =UGIv + hF4Dub78fMESoMASAQdAf9qty6ZhueDUMAh05KtdT9N/VfADCWb7D7SSzfT3Wlsw + 49MzT0tApQAvEQUIxVWGmMrhT/8ohHtWSE4BGtFkq/9bNqz6tMv2O0x2a31JLrpP + 1GgBCQIQR8LD7XKQndP2fJcvmlNeE/dQSc1h/EBB5iWLY9zgARKm1k8l4Jxyc5Z0 + oNuJoApjSnn8NTMGVDCFQY6mytMWpkkD3ZuUtXOVqzJwvV4OGCMFjrmvdunXrkNE + TL8kCaUFyl5+dQ== + =vvQW -----END PGP MESSAGE----- fp: 0C8AF4B4320A511384DF6B5BB9BEFC7CC112A0C0 - - created_at: "2024-08-20T16:30:04Z" + - created_at: "2024-08-20T22:32:59Z" enc: |- -----BEGIN PGP MESSAGE----- - hF4DLHeEFiC484ASAQdAkbRGfyGnVF18H00wI1pbLUn8DtTxjlr2VqUSKBYz5Tgw - LXOpyHzQTaW1YULV1zGZEKFxSGorJJ+Iy0X2/CS0dXHpHrTh9clJOJM59LfQlyOO - 1GgBCQIQ+eGW98VVdNYm9mEcc0UTi8TXsDK9gMXtpCBYTQXnZHHu1xI5BevwnT4t - aLaoX1gTxOl89gQRHIN6ZqH2pXT5IcObG0Atro/GMaAjkvkijGdwuw8hzCtmX1Ap - GWNsovjdVgJq+w== - =bDLY + hF4DLHeEFiC484ASAQdA8RK1aKiXM7TqFY6gwVW1OeFLvgqq4WfN4dr/emzJ2UEw + HnknNN/If/jSFezuGxpyY3qx6Vq1QYT8MgqZMDJiktZhTheQW6JJ5Pi3ab6q2YvU + 1GgBCQIQzs0l2zLP6BBWGJweq6EWyMBhhVs0jcIR7JXSTVXtWkpCfLDIJVaXf23z + jj7RruJvG2BXDoR3mpeJLbI/7L5liJUESDrarV5GCebOdsddEFqI6dVOwZbNDhTy + eut6YKbhRGVRtg== + =ivM4 -----END PGP MESSAGE----- fp: 403215E0F99D2582C7055C512C77841620B8F380 - - created_at: "2024-08-20T16:30:04Z" + - created_at: "2024-08-20T22:32:59Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA08nOrzNSYBrARAAoZO/seNA1kj1gYRMjOnGxsgZ0EUv9kXiWqlxCk070/Db - t8ryeLobgzq+WTNEuK+LHOVl5ddEBVXWZQAUkthZuRqvYiIEPUH2VZCShk+iNpMH - JvEqmiIuF+w9xP0Yk1w+UUK/JO3yTCGJBRwS7Dwr1o/wfRIRylqmuRD+jlqvzOlO - xisqPNGuiZEv0KmdK1Nzwb0IF77Cku2hspo5IuFuBB1HbjUZ2WhKbQV+NYFejS99 - CMjXSEXI2Pcva2ebMzfLhkodXi5l3bezveK1ohkPkgflPkQvRZOgT9LcmBtIrU8U - 4EA8/5NlFrT0gSz21tsg5h9aES22bAXykgHihKQ8p2yAiXVJ/2Gf58KtkAQKIqab - LbgP+OkfXTZJhthL/EhUt0ibIYJtD4O9RMiE60F0skqt/TpAv6Iwq/hGy9UQFvms - DtZZRKrRdexJ6Q3ax1bjcLFnIpE8EfPe7Vi1fwVfg6b2s463ZcuYmB43gN6UiHUw - yxoCGJXAP9B4snwyis6+tgR/csMPapni5hkUyGJXAPjwrqoNgW492kGKIYR+38w4 - owYGHwBnb8PqEk1FDLdx99BXLUhe1wTYO74uwbDjnjk9hNYieFOiFB68g1JwMEK7 - /Q8WlGjXx5MqobyeSjwv2YDx5l/x/WbikF/QiXONILnhnw/qH+yhCmLr2xa18bvS - WAGsvFloncZnFZwJ+0qWNN9XE4rYHPbQntPDeSRnW13XM3kqL9ZAxpFzD6Eey2N9 - eaOfgsx6X4gx+LSJf1lx1XFCWPJBULDxULmZgn4A13wF2EN4RVNryIQ= - =Aetu + hQIMA08nOrzNSYBrAQ/+Ji61Ouf7d5x6W5DGukElbFwu2P64q0EIWSF4xG/AV9iF + /7a8lMfVINUNa6tO+d0CZs6KdMoQZtIfsqCWDJfMzip5jlKz1MYRF9zSBwlPrfxT + nj5ZwgyigZd/x0ZK19ubYJ2HqhyH+TYfWdxSOHb+eS23TIArCnyvzY9LFi8shfWM + diTAKxUkPoqbQQyqc7jh/gWbbpqdu2nxEQuxxLp/8Bc/o0CPYozaeOHWhOf5btwq + EPZQUySd+7KI28OPWBQKoZGIoPKQcH4qJex9awAVsTdxcuRj3d/MS3KnNKPf9ksA + zUJHNYT/8PYojwEhUCBQ1m9RnaNZ0qHy9CnY2CdoB+l301KULVJXaIw24s+fvq6W + 0oCIEwzr2wwYXkzm7Uh2S9QIiyf+ZpdEe+uBSGtHef0T/BRbbvRz8Ucp7U/njTCU + OYGVQsVKrdpF34vXXmnez+NCw/W17loOKUGAnuO7ZuZaKLXFFsd4fObSYU5vakmR + 9czrnIpskrh22TQ+154eJxkf4AfvvRzzPcvDSTcg0IMJED/9IWlqR0ddsuLSWBY+ + UmX58K4kldslSi/2CktgHamAFhN75BZeQyQlksTeMgNEKS+X0pAXmv0a8T002mQf + ugxz+6zqnF4eKypzcJ9zMWLYUfziHKmHfVlUPUC0BXaF4BJTBoETTpLAVasY1pXS + WAELRfPtQcEQTKCuOV9Ucz23Omu8sAjnhtMyoZPTYZgBirEz4dURCoW3Ye5jShK9 + btpq7IIMvr6Rufnp4TsW1BI0//mX7ShIU+tz/k8a2OHpDph8FpFTx8Y= + =j80V -----END PGP MESSAGE----- fp: 3176be14f468c6d43ab2206b4f273abccd49806b - - created_at: "2024-08-20T16:30:04Z" + - created_at: "2024-08-20T22:32:59Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA2UzePEMpuAKAQ/+Jt3+VUGX4xsuY16VOyN+pUfQj/VWvaEc+kh1mEzZkOul - 8E2MA7HgB0pF3fiAcOT9nZgFDvvTUfXE0O1jiSStT6sl59Od3EZFWGLnuL4Wmlx/ - eQLCK4KAEdfr3qFJQ4MEh4dhFkSQRyaBrCsVl9P27KDLhmPQnfuF53MkNWubfECF - swBZLa0I5udg5aPfKIv49IINKgyNFNL/6NWf+iKAObrGtOwEEyATFXZf8N1IS29N - 69C/c9Q1/WtDrm1QVhZKe/A2PGUze5NzSKJJblUBntOuQQ+MoxXWiyf/08wuTGrp - EzlhcCCqt+qiB/s/pnRfsr2zfxWYiivUOj0ZIM3wlNhVrJFJLsH6Yfi2sxtys+oe - iqqAMW7C/8MFPV/g0nRq9gNToR5nabbunan2fLvCFOmLLDPhEYvGUxHaG4h+F3Nz - C9H2wmCowqBVGQPRBlDxwkR6v+teRHS9329A/hokAT15gxczaaXo80jsonsZWT/C - aHdAMN5trOqhALF0ZztDSQKi/wdmF0RJOMLWZIizRR3vMkSE3DY0BL9d8fPlIGTL - EdLJ4LU/8/BW63sUJ51sDsbf2l6TTExVt3s9x+YK8ot/oNOVB6wXLbRmxRxQ+qEF - GrDlrkJsFsjvqSa+oWqvivilAstOD5rTD6ZWL9AWGA4KcrOqpOZhS3NLFXLDxMfS - WAHYBcXDxR/rvpjWdsXAxTuSX+eK2cNiPy0d/LYkNxYnqGOjlXNAUmqkG+TCQVrO - MDyW0vRY1HiCuxM46Dz7VEwUXaMKhV/ofNuly5BTpjR48XV1cheU+vs= - =Z3Tf + hQIMA2UzePEMpuAKAQ//V29gGjU/84DIU4tRlTpk6vGJhNK5AsnqcP0oGMXSZbly + oTRNxEro2WlN/B1Wb1Gzy/9Jj2URNYft69GgLec5p1JwE9V0OFA74xSsCjAQtPzg + ZzZiuyC56BQxYWdcvaJf4qvMWMmphB0VDMDaFVoPLMJZ9ss0x/yjHwgbWtORGLMy + 8fvOmksRJpYaKhtqfdfF6ZQFAfIJv/F0tnjrqQhZ5IjbwHI+YHQl15aMTYulA+W1 + LWKruVBb64BffXkmi8ZinqdmNzCDI3UMDXFpT4TuVGlQ4kSJgjrmOZc30WypuHJf + tffmWhV8002rwZCloeY1bKlB5ENpPs4f0ydfymwXNvIG0GraATQcohtnx2e7WXc3 + DqVEGExZNvTK/0d3zTZVRuC2/0+ZcBpHJpiFJOiLqkNL7w8JsQ8r0gY+PZagROtM + YbnOQ0YBWtyYzXh5dO6gDKGySU7b+5KGpr9U6NN6owdz0QcABQJBRficFKAhOQio + GZjq5ODE7pwlwcYKnCvLjfCx4mC5UY2B0U7RmyPhc+G6ql9jLgzTDYMhl3KIABMo + FvrZFIT9ukQ1otHSpApjoyeUdS9Sr7vLBcMg2GHrx2pfH2DIevVgUu3mgpACEEPJ + R1WTUr9hmqXNXaCP7F57p3hpOqGK6FTW0gEDHjSBP4sa8an2Z6ebWxaNzK2B12/S + WAHl5x28cT++faH6+u+I1DYsLPGTfKaKxHsYWU/AcBoGepJw+yvhb0p2tigdQSjT + SILbzn/q59RqCoMFxH6zTQPfLzPpd6AkzmMhBbzGZOvOzP1mQQVQE9g= + =diMc -----END PGP MESSAGE----- fp: 17FEEBB45E4245330507C960653378F10CA6E00A - - created_at: "2024-08-20T16:30:04Z" + - created_at: "2024-08-20T22:32:59Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA5TfpJU9hyneAQ/9GNKzPjVgyodjeUkffsqUzhZLC4cehHHs8QknTWxePDIC - EAc3nCUicKPZXroXPvLYq+i3u6CLUQdLW+qlaGUXVjIAxSYoDdVd8mj8W3MxWD4P - ykvRyfLHIFeAaPyzqTVDdSpX0J1IQFzb4/EvW989Dyftu0IOEf/7fgoLGmxGXS2+ - Xua/s84wk2QbldYEhGHYW8zSNCh2QBk6dFFzqSI3XtmDJ309p2xVND4z2scigRRj - S2EvAzyAVFf/yLOICS/VtJkZgBbwVC6Zlz+t52IdY+oi8EIuREgJVpxH00M7u2D/ - frp4qc1ExYipzuSsLS2bQ1s/+9Nct0E53SQmO5H/pAFzGbqav545epcXtZSZgkfy - POjDzR9qkv7Hs+xc4OcVMdxGJpeH5vVyrOdEz/cJTFjq7+psnpadtA/4COn29f4T - 5d4SduinA+oDyyXD8jlOgVS/PpyqGc6rB/kHrFbK1fAxs9Kl+R+FgYXBBx/iO/if - j7L53Xx1/J6CYEffUAQFTgsslYtXlwal0z12KSZiI/5Fa9+b3wB7fQfYcjm/+CSN - BfB8Wjbyx3dk+zQSoieebYKU4/Lu2haMXAd0edYudz2kWrHderTOwuf/D2yLXYDN - 5CV5clyWT7w0WP/zyjAVopPz6fmLt5iV+7F5U3QLudJiR2qBX+VNT19IllGeJZ3S - WAH0ct1ufKP1xWgBSUJAsL3tmbKpJnV5EwELdzs5/Yj/50YjFTRo/KSJIPel50F5 - 8C72fLqmqJrMC1XkStRIz6cZpcnpK8vTwBNACXXIMtc58xwbUQSb9lA= - =xr7d + hQIMA5TfpJU9hyneAQ/9FMDmgyZf3aCD5QPZTrwrz6TOmDOyndvMUCg5qQba8XGO + ryLb35S9gmlwo9u/dZaAXL0TcWKA+AKOJpRa5jiH5O+8iFLNpgv3A0AO2m9xdVeO + QvE9MzQVd0u9MOtReZ0u0sE/HnurRkYgpksFT435Fg3qSZ1cY+JjzQujheQ6jj1a + agaA09qz66RCHLZ4pZL9tu382B+hZYL+KoOyNqR0pKc2ecKEAe+OUS1kxqGb2Gs8 + twFFibwyvFs80UygqOpPxOobyaU4AeZguEApv+TOA7EmHCzcNnKB1RHWCKfup7Zh + dA+55Cq5yDGXDyeRsSQOeQcff99aYyZG+j5WafNv0IPiPFNlS/R+ak2xqp+oxzPI + KoNn/DD4FL8V5neH53nYj49x6OlG90Dv6hK/AcULl8pTxq6Hu0Vditgn/OlzT5rE + BQKRxZ+XBFU4GLgjiQIXahJ8voDH/Kyxb1VAZsoRrKNYK3VUjC4ODKI5LJAJGxfZ + CNUfyiynQ1HLQ7UUnKOzEEtxeZd6DuZYadsCvrdNuDPd+TVXR7XJLQPiM0Lp+ceQ + 8RcqX48CfKNun950h9z+6b/1poZqtwYIzb3qsgUExt6dDGNxAHdvYhFLQfC4fysq + MrYSqalJsVsxFKmG7uDqtG0YI7r4vntSiiE1CCd1I8uamj++Yo9JAJgn1FyJic3S + WAGinFjUm6ohbVtppNBkUcS5XJish6MU2Hh1UsK2RGDarsuendzBOHZKfGN2uZAU + S2pVRt39ruehNyPRZG4UFCGPvyUWFsDvmr1J7WlAGDASEwZ2IlvD0Qw= + =B1nw -----END PGP MESSAGE----- fp: 4EA330328CD0D3076E90960194DFA4953D8729DE - - created_at: "2024-08-20T16:30:04Z" + - created_at: "2024-08-20T22:32:59Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA2nIGHycQ3VOARAAnSSb7z1VcwOdBbqbGqi7OUKO2q0Tbz+SfAP/tX32+ivW - ZbGk7X8z8xpTJJ1mPcxOmmXoLJmiSyS5F5/+swpfheOYzZ5NjIQnvYEnUmlkm0RY - geDjkt2OIEHevpsW0giAiV4wGOMhE+aavB5xrYOUXKRcbi3y8AOMDsjxpvy+ZQgA - qqGT016eTa31XGOTQ5asqb+sPbvUcONnYTt4y+8XuzctL9jc/Fwmk89Z0/im8+qj - QYRHSEEAA29yYBC91nqygdGpO57+oeObyMBjcn4vHJXppLBGGdkMsQegCBXr3rJY - WrksmyIIGptd/8bDZFineoKw6FhI47shw2/bM7sfdPl1yZExiASfV4smUk3jyq9c - noo0xE46KUi3FENg+XYP/o3QBsyzwvsboyVBKWmZ6xV2iE0wFi0vybFAnxplZNLT - 4XhQNKXC2A1DukCQIBntfaGov2zUl5nC5uk9AY03uhczxLAzBNEPf8Yn6OMgbeP5 - NUzZ+5OxaeecyZedpc3CtyreYJziy1IZHFqmFNy637U4Ve5+4XniySO1zlXeaZdq - E0xqwUCXxWnmDDbNh6WPVGpmabD/l9eUOkCC5tCSmQBvNwJSGBV+3mK/8nqVKznR - NV0SO84pUY6HrAnzSSDh7dch2zVkYAhmw3N4yndhhpa8lnh5OdzEa4jC+MOztDTS - WAFaIczyQCj/xNY19JDEhqhx3lMJGvzQqq2OsrFfrfuTjLr7HPJfujJ8+xFwIt6D - VvEBj73P1cjx1NYkvpRZcTzuvRxK1UxKVEh3UKXJrMhHTvdNyLN6MCE= - =zdd2 + hQIMA2nIGHycQ3VOAQ/+L/J90b8NLLqDnznK/LGApKSc/xi2kS55yZW08pPvoe3E + Thk9aLZOE6hvdu+rQxWfGhHRDyyvCh4AFGVCJ1NwnT9RM0UBJYfeI5ERNiInIjud + 9E/HAWpGBgtm2wRYbMX3zqIT0H/8UyyFkczyHvSCIvmgf2yH7KCgpzXoX87Qcqvj + 9+v+fiPjij43rTSD7VtA6zEXwQLyJsTFgmsK9iIySnKGuxxfanyuzi6oklUC8eIZ + iHKKeJsKuFvyb8FI6GrUYgC3MsxhkpQ6MYSIP2V3RBZdg2jnQpRm7HH7K1KKaFvU + 2rsQ6eoBNnBsm0yQ2SotL+UXDKL845tALqYHjfM7WaopP6g/iOylDevotV/jGVaQ + 5VD9KWE4RwUZjUTIgkQJew8hXLR+tMPNmw6SpRVtiAK4tF8mxydxjLsXYTz4KSTb + MkytYzyhi29vMJWB0Qv/ewWVODfvTdqSaaCzfKFW9W4SHziYKRrPF7ekR7CV8sLG + Cj7v1GHsLdHgxO7ccD8yFNp1TEu/AlsQk+ziDoPJOaWZXthuG3brwX/jvAtFH7D3 + DYWdhkOcxY7JtbcMRTznB7Uz6D5WQuF470xKpC19W7MOD/zPoreP8Y4GCBbQSLxC + IZSih0Xpess8LVkEHwttu432aqyRBvI0eFh2zh7/mn0gziG7NX7wfU5W+GDAtM7S + WAGXrqS3P1+igMKFI/ENp1IDkYVzcPjNrCFw1cMdpiWTq0AU0z5tPjJNJCLHue/s + LUy/H/1LMrpy2ce53LMfcoFkIQpPLN5j4wL8FPVQcb8g1pZ0GaYNeJ0= + =1E6h -----END PGP MESSAGE----- fp: 2372651C56E22972C2D9F3F569C8187C9C43754E - - created_at: "2024-08-20T16:30:04Z" + - created_at: "2024-08-20T22:32:59Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA0Sjf6jBUFOzAQ/+K9aDfdfi+3VtGVADPPCybGRd00O9fJmd32NmGgKAIZeq - ThX9+BNF+ra4Q0rMOFZs/61AC1q+J92J3iGCfpd6UphnU8KgnuCv1iKqzfaRNahp - 89jr7/gmVti7+AMT1sKaQZm95SL/BZxzqrSzJzVm6GAaoet0SJsCsOM2OSCb7uZO - /NYRYY3mVALDB7/XKUbSEdapT+/63VQ2ZsIdGGrfDWzHlCUiiGzhDXYKLOxlcu0T - yfzr19BhxxVmJYLvEvkmmWcLJxcUIv1kdS//tw07NQuyEI18BzgALznk6URWK3/5 - 7DNBvBuM2rky4/38p68zZ72ESq+w0s1gOMLzkcfkzwqu2W6MoeoLtUPnTIalp5ee - tsP/tzB3n1AS53T7WxFe8LPOz6lLpVPoYyVmrMKK7aaWwwDUxIuGo1dBVbfJYEUx - Dh0j5JprvnlNQjQufXkn/v2pkYhSwLn218TXIgO+rW+V5xn3FDYAREjNsCtK/U/l - cU9mekqAGlkA6cZzcDQ8mT36YbQuZanA5uoiszqVJHEllAy416uVvNR3Rsv12KiT - 4wu92XHeI3ZEl3tcnxj+RAMcrs7ErVPBzk2noP6SghQsBgzpMvlg6HTKEbqg8XI9 - oTCzkjezotUhJBVFKzyNvzJ9aIwSu1DlK8zi7D7qiIqMANxq2gBU8evsUbV/KZzS - WAG5OyZYSOZ58N5yCpdcJfx5xfKSaOde7TA/C94trWj82D42EPouuDaIG3N2Zpis - 0bFZuqtB+oeTyM9BLoMPV/rFs29HVE5PAAtkwTBn8uLQiePdWrBZDGw= - =D5uz + hQIMA0Sjf6jBUFOzAQ/8CGe3bEUUuvCGPnEZxCQGFHh5EJcNBfh73/bFx0ag3IEu + uhGjtWXCoOWr5H3pEMlqVT/aLGiEoYkJQfMLd2famHhoeggMfyHFv8bZRHu/jJ+Z + /35mlGoJ5YZjAl0WEj9+9DrLNn+VHSuNNxiH377eutJBuygQE8N2EDJeciHuuVxP + d7zhX9U4AuybWw+sqwPC5qah1s/2Ceuu0BVXLHpDS1/O5gnOOqVctbWlTcdrGuDV + R+yBqClkQ9KLDk3fzYg0ulrmjDJqHI/QXt43ImAZSEsrreg2OA7CZA8Z1OMYHNNV + +71xE6PzkjZReR/J2Dje03SQR6rakEZcBkbhANUhOVL9JBjBGCloEDD2dWK7kFNd + AcYoauKWI/7DsIWTbL2F+Yc5p7rf6SlzMlJW2Dfk4hfoFjiDdcYu51pMAVTMt+cY + eGC2gPyKzo+axY2+EQnwuiGjsBNTz6NyWG+rfpGtZ4/HrnRjLFnqGGExCDau+IlW + jYy83DcgInFHLw9TmaA/0t9vW6kBKEwEuYiJhSexUGUNLEjLwCREQfTTuC29Fghp + 5neMS8fJMribQup1FUnfIYRZs+7EfGiS1FiVzzY7OGRXMxEaYL+13lVqPzpcSV9w + ZNC1II5XBtxWsHqpyEX2XTmYPrdu9yNcz1QBa++ypSG0qBq5kD4oFOc21WalbA/S + WAHT98W5dKddbNXXCHoRZDXZLmei+XRdOOqMwzyjyTODkehRm2On3Xamy+gh3wGx + RftfMyiicVdGKrHb9o/B9sTPpDzGF1Up5MFp/mjovWe/6EIMlzCG/xA= + =38lj -----END PGP MESSAGE----- fp: 23EEDF49AAF1B41DCD1CD10F44A37FA8C15053B3 - - created_at: "2024-08-20T16:30:04Z" + - created_at: "2024-08-20T22:32:59Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMAyhQdcrIW3A1AQ/9HaKPNd7rD0SfEh3Tb9E9isn0TVpVKWVnfWzxwcl3Mzic - /r6DFNT9HPx7EtwCHyRf/AMdrjy52/fEHZ5TIWE+ELnroGigwBPEoB27vgk/d7rw - JAHFGvhG0HEbCUgmTCjzskhlYg//4cXr5PoD7nACfM+ZJj00RMxpUO3kzOt+6c4C - FjFwTfTDvJUf1CrRpstmPY9hLvvC/1nQ1HH1EYRk7feu+kT1dNWnVfcjvZRqBwIY - Bpk6HHwPb7wni5slO5MB0P1bA63VyOg7AS3G6AIvmeQCH7G/XGsIyUwTI/fOZeDL - rt2gtNqgSCBxX9Ql7ZZzCKZWVkYk+u1KMIu66AJ4bxONIJ3iefa2fVaCA7XJABUV - zMvvDDJGBhhENxXYkFi24RTGsXvcyMuzQ+zaiKnMQOFjP7iMWKwI3ZNzW9xR7n8k - 14Z6cVZNgpKxF1KAdxnqjxQbOAkJaLSiuahvZV24wbv0jr46KhQLUqrzs7dhqQVM - /UiCPtvFB1Zmpf3Cn4wk/LhWmNd5LnUpWXQmUf/u+/cLrDrXU67Aw6IHPB3dq/Wi - jeSOYpFtj9klUcEaKmZUEwZFRW607U7YIP1L2VAJHbv3tf8MShyYOEdIQ/K5qqtr - 59V07u4oZQu+MjjthjdQRr88Glc8bRbbhIhs7FRHD3E4gKP1NHRG1HvwTq6eMFzS - WAEIoTRR6wKTtSJpFnI1+GozZyxOYxY28vBXF066VhGSTA/weAj4GtEK5pc2KL+s - 5PZDB8DMc9RN8EwSO2JKyr/SEXaRIQzzDcwlOWQ1znmXuWllbx2tADA= - =mYCr + hQIMAyhQdcrIW3A1AQ//dsIcQ/e2+8IxUiJFeb1vuCcVV3Y1WV8aPBAapTuIbHLc + NSWwpR/s34qzxnatgL4dNG113OU+N+YCUHb7/8fMCOtfBTcvqzplOQlCZQ25YMhg + 6mLwOrQFrFsfB7X2ppnxn4c3bNHCXWUl8Gxk+o+kDQwEZvswh7nO+DOxsE9592NQ + 6gbxGoBEN3REIdJF1Q/6hh44qz9pYwDfONIXL0DykKG7BZtanREZKwdTqKJu9BfM + 3MY4q9tmYbYEV00O81IJrRKHVk0ftRkh6+70hREriEzKAk1pVg93uAJ8eq/+uBkD + sltIaHjV9a2sUKtQrZAUUy5rHjLEZSfXpN3wZf/Kmd3eh3m0PsZTYrsPrClWXCfq + gB06/NaW9PTqQVKeQ/Dz1bHy+SSlEuuL7SqxrLQNAdm8334Ca5nwwMjQcoQHvJ6l + TYT18OhbI8YzTS+0q3YcmaQhzACaRgbjSD2DH/wdpDwpovymxsbYjSGyoEnBorL7 + 8ALaK4qGDSvpAXtR89l7lv5EcUTkiup6KtEA0X/pC0sZtzE1LlRInaT6+7n1w128 + pG6lPkb3HWlKD4tye1LPSzA9qaE20eyhBsoNv+EGfv6xznB8km8pKc0is7oT/+xf + dueJQvNz+YAj63ftYjbH/OVnXaa9nl0DSJLGwGfVRvKVN8+uhVaD5Nd+WR/pPBHS + WAEmg6IG/3ImzWLCmySM0wENlTXsCJY5c1lHnONH+co2VoLgMiwzwyj/3XhqYcL6 + MCZRiDYDWOp5klV53y6cBtsZBbpw7Hj8a6h0Js0KtklMfJGwhhijXbA= + =G8hj -----END PGP MESSAGE----- fp: 06a917fc4a2a1b6b0f69a830285075cac85b7035 - - created_at: "2024-08-20T16:30:04Z" + - created_at: "2024-08-20T22:32:59Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA2YOabq+5CZDAQ/7BZ9lq09ORo2scGORFzvcwmmWE5f4KUIbxX18azEZBOYR - s7n9QJob1NrU/wqRs7/1K+P3lxPll/Tos/WHuCQXEiVntz4oV3xbGyBT6Dzk4e6C - i+TVnuqThNbuusd+vm57ZAzbI0NQKc9m5bKAZhfEJWRE3f+itUxXrwJwRIudW9Ut - b2KgUstfJUOZXrECoSxleLO3Fks9X/DgtrNpBLNixjUbOU7TV//2MyunxwzrHKR+ - 88bAdC0uDfczo3mIz5fo+74BoskHFaH5hioW9b/q5h5WU+3GDM9qzk180k0xVK0d - BGlTpDvDIxlgU+b5/ZN2F8ol9jpwJ7AHijdW+w4qNe57BHlKIEk4kV0t2dTmN/0x - h/VVn7j6Ptwy/cn+N6AdQRziZH/Mu8adEqJU/EY1cWQjJsHm9XkwD0PFAbPjq1rA - lHv6JJbKmmBlUwPJzihMAS6+748IDnyQ4sZQw6qLC+koV3jP3cSqvrYURRXWuPtF - vC1tcS0lvyjSxNIqcAxQaEK5Ch4DCYz1305yet7LlMkp83E3PzAJPSyHFCpwx84C - +n+iZ0lja9JaGRMhCI4KcwGJ9Vdw+vxaRi/FlcDFH75g6915zH9/JlcdI72L85uK - yeTq25OAE3Dg1/IQcjlyDGZ99rnPfq8Q6InyON3HpEulF+0BUUVe48mVuZLZZ9PS - WAGU1EfX9PoPt4CcOag0712W5Rrmjx5zd0tofnCkxIQ43NMsoUNeyzyTzELZPk0r - v/vljlEfIAeNd6tbhQzCMo4c/y1D5k7Td1C0a372JgSjMnDzCn1OdMY= - =ppke + hQIMA3FYa3pMDBplARAAgnTuOJJxv31KsodTrpBY6j2HJmLs0bIEYjsLeyZlNWKO + 4oBVFJEhHdOddgYizaGi0NkJBpH+eN5khT9njslyB+p2cAvNCpKCEp/vpbvbWhsL + fNSA/2zP2+dZBI9VPxGSW8YABlJv5abs3GFTXHGg0zcgtPGkjjNyP8+WfaOOb6kP + 1OLGokKe/ALN87l/27J3spNSwR1C8wvqZ/0elvhQQhhQtBpG3BT/vnxEKZPHIh7Z + 1BIP30tYRpvSGADfq3p9DxsurBgdNQK9aIq6YnKoWq1gLnOKfe00mxV1L91zKSLE + sRno13k+2Oj5uDpS1H+WtnAN7Rj9AfFw149NAubJuwovWlCOe+/3/1WgVt3y72mn + Xgo2K3e5SSIjTkgzzVsGAPqOVlznvoVECBHzSUjPHaXGxybNCHd3WYQgTqLtFwUZ + tbbiexvSfTg9Wud8Y1CnMsYGYnkcreu77Kc52aj49t+y0DXuL7/oOzs+MkN+u81c + sLs/DqzUueP4/d90V5QeQXzuQqOlB3NWLH+KMNK2O/moZlGGFA3Bi+gAZoGGHclC + Uy9BBY5COGON+VX0iT5xKt1v7Jgq6vI81Gi6bkEUZ1OMW9Hz7mErxYnKiYutduz1 + 1w/r5pNiLGQfX5KSYg33GZ5yACBRXTQZ/5RQpvUQ1IuirS7LmSQmpIFj3Wkz6rHS + WAFG+fatTeX+U2byDgtfQ8DOX9PGx3ZoHcg1VvOBVzE21CcbCqhm2rK8sVMByyBm + EG3fvIayLK2JeE/5ENRW82Pj6N0SmaberDErj4xntNECLrDuJk6hK1Y= + =ZbM8 -----END PGP MESSAGE----- - fp: a53d4ca8d2cf54613822c81d660e69babee42643 - - created_at: "2024-08-20T16:30:04Z" + fp: 1f18a57e1d4e6716aed0e0cd71586b7a4c0c1a65 + - created_at: "2024-08-20T22:32:59Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA8mCvf2Chj0JAQ/7Bj4WD3H6qvY1ealIuATfdiPoUNXKAGIzIbNcZf2gY/r3 - vp4VLL3G0ODNmRAMx3otDEfZFmRP9BMf6T3egWjMmW9ulANAzfRoDQEvW3jEQSlA - Crz6BuFgdOWcFZfFkVGa9g1AJK+wx+jZ9uzZxudkAvulBJb0vB0KrNcdvMyca6kg - /tGookOMGzBKQWcKnL4ZM8K2p4PbwxuLiOVEvJ2j33EwxAG1s9L9SIR1RdI7CKAS - eU985YlXrPSdmR2oAIiCLAvDMnOoMeI+oIchx5UcuMT4V43C912pTYnSJ6wae5DP - 21/N2O3VZWd1vUWL66eNh8cz8kq6lim5zLfLk4AZBmMfyRCM3jwGCUJNrTCaqx7p - heX6ya8jC4MIZa8QRdJ9mpZny9cfsf8Zg5P5eXmieQcRCEjKZhUiVQ7xtFs5Wklg - ff1sT1lpCrIiA9DCzScuwSOkqmWj+4Q/rs6z7C/cg+Iocwd/YAopd59ezHdURysz - dU6jjwnkXA19Uq8+VWWuOTk0Ctpk8lysJIQcAdE5BNMn9kKXuCXAreGv6tOy5aGH - UPRqnCrWc6qcD2bAoKOONiOInGWgs+NhegK6WoS4UqizjKQUzGDgqtHsT30mDNFp - yI0KBKvh1fg9LmoT2edeX41beWv1evpmrsLn45+oHvFbUGS2gO9ag5G3Pj+MmFXS - WAE5MbV++4ogFSuIwwNq81DeWobwtRdQOwJz7Z4QbdRobRgMU/kQNMwy3pkSPOd/ - GyUdzfS5VTg39GEsp6FQ8yDtOfr2AVFsnswCMx/940fR2OEKzGtvvfo= - =CkGq + hQIMA8mCvf2Chj0JAQ/+NId7BWeD1tjA2ROCVsjpNMPAUHfZxsBoP2UqOfcGh9Ou + 6XSfKhdB7OImUfJESr5YKswqbIcUAUbyG3H7mDs1Ztj9I7Uf6NpnFjamwLKkFCR9 + g4716imh+R60eX6tOAYgMRBsx7RPu2j+78GWfxdHTVMAZbm/YIX6PPbBJCGYD3XK + uyPv+ifPC0VfERbtoNNb29FWJVtlB5SQVxcW9m0lNRZt1wuHESW9XJyA5f8gR7QA + 1sSOkeqlEZSGcu98PLwtcDGmvOp2s+gPv1hEEAdcniE9qeKir4ZfOVKt/cPW+S32 + SUbT8pROLEyWzqAxziIWbJxrycuSBpBHhAyMJI1LLgMsjumAuT4gIlws9AUNLBJL + O0/1gsPSyt21B36wyt4VG9/K1Hu8CPNE7PBavjOCCK2WEY/WEpPALbWnwkAkwvBc + bcFTwuah1R0rwfM33wRYppQ88n+a8mwAkWqJdVxdO3nbsIf/He/Q2sBlQkbGJ2+0 + Qg8MOloHEddI1TJyRNmxUfrM/4sx1BS+olxN5/BHQw+Lbh1uJfLLNw7CTEpRr50t + +Nqcs46F/ydBrSGhHBuzSUj1S37cTVzJVULKCPDEAImselQ+dHy51n+5UBeIABIV + Fec/EOi6lpiRf0ZNrQJCMWjzqetWUU2BHFeONhGAJ5jH/P+XL4WGJe1MnK6ifZzS + WAHLiyNyTve4MOIHSQJJ2WJim0DRp5FDQmKQ0/V7cSvBJauL4GIv+Oi4hyzlKgO/ + 9MMISHRqOy4/9pdR9aUAj0H19prILDFX+I0Akh8LuSnrOmhjH4HuvdY= + =MCCh -----END PGP MESSAGE----- fp: 2b9be9660662c6c979ca1149c982bdfd82863d09 unencrypted_suffix: _unencrypted