move git.cyplo.dev to cupsnet

2024-01-01 16:50:13 +00:00 · 2024-01-01 16:50:13 +00:00 · 343e7979fa
parent 04f4344a31
commit 343e7979fa
10 changed files with 206 additions and 120 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@ -7,6 +7,7 @@ keys:
  - &vpsfree1 age10f7djsyu5fwew2l2x89a4st4qw4xdkyr3z7qd8frs54yqz7cayvqruttla
  - &vultr1 age10f7djsyu5fwew2l2x89a4st4qw4xdkyr3z7qd8frs54yqz7cayvqruttla
  - &mb1 age18vg9wvmj2jc8tdcyc202v46lvfndqfe3dse2hewx0snalpvk43fqc22n6y
+  - &cupsnet age108m6yx77k7aqcyesy4zmkulryzvyep6m92pflmldcnv3w5a0k9xqn5h7cx
  - &thinky-source age1n09swn3qekcuw23vksp7hv4hpg0krlag3c5qcjjaf08m99c3ysqs6sxeyk
  - &thinky-target age1tt4c8t72fha2fj7xlm0dew5avmkdxujmgplte4qm7sxlcucggedq0eyk7t
 creation_rules:
@ -21,5 +22,6 @@ creation_rules:
      - *vpsfree1
      - *vultr1
      - *mb1
+      - *cupsnet
      - *thinky-source
      - *thinky-target
--- a/nixos/boxes/cupsnet/README.md
+++ b/nixos/boxes/cupsnet/README.md
@ -2,3 +2,7 @@
 * boot
 * add ssh authorized key for root
 * `nix run github:numtide/nixos-anywhere -- root@v2202401214093251449.happysrv.de --flake '.#cupsnet'`
+* reboot
+* add public key to sops to decrypt secrets, get the key by ` ssh-keyscan cupsnet.cyplo.dev  | ssh-to-age`
+* reencrypt secrets if needed
+ 
--- a/nixos/boxes/cupsnet/default.nix
+++ b/nixos/boxes/cupsnet/default.nix
@ -11,6 +11,8 @@
    ../send-logs.nix
    ./boot.nix
    ./disks.nix
+    ./gitea.nix
+    ./ssh.nix
  ];
  networking.hostName = "cupsnet";

--- a/nixos/boxes/vpsfree1/gitea.nix
+++ b/nixos/boxes/vpsfree1/gitea.nix
--- a/nixos/boxes/cupsnet/mailgun.sops.yaml
+++ b/nixos/boxes/cupsnet/mailgun.sops.yaml
@ -0,0 +1,103 @@
+gitea-mailgun-smtp-password: ENC[AES256_GCM,data:dIfcxK5ZQGNqnOfTdVI7FzR9RgP3Ao/bk7XDZULHby58MJumhESELRCkHgKhOSqTAQE=,iv:xjtVQEILVl+XFel+thoS8OvF/fpFYSNtt5MTRUhgyrI=,tag:TJPBQG4xsbHrcdXCbDdejg==,type:str]
+mastodon-mailgun-smtp-password: ENC[AES256_GCM,data:h2SSa/053BBIo3Y03TB+1SW6C9DFighMVgY1jzGcUZLhiZ/jd2YbTYlq83Nbb5GBZAY=,iv:9BJuVSfOC48K69kDLUjr1oK3g0xSKAxlzDI/py3STt8=,tag:DTE2OemwbZ0U59wF/9NQjA==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1qpxvqf2254vynw7aah2pyd8tm0lqtfqr9maguewdj3uqjp8smqvssjp43n
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxSU5QcWJXMFF4WGE0Z3My
+            d3RDVER3ODVnYVNvQSsyOTBXNmNicDJRYUNrCkRyYlVkS0FSMVgwZU1uL3RLakNV
+            ZzliNTJwc2VVQzJYbFNPbTJXelVaRDgKLS0tIDdtVEVuZm1XVWhpS1BnOFdMQlBa
+            VzROUithSjhEQVJoaWNxU3Y2Z09vckkKOfeoRywFNbPfPxosKassTpdhj0gu7HgG
+            V8AEHm8F1sI2OZpyvGq8zEbE7jw9X6prmkvue398/NOuP1HvmqDoKw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1s3z2rfske90kt93a3z7twp6kew6mqd08sgunupym0gpmuh8ezqqscdrv7m
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCdlpsUWVmdnErb1d6ZDVS
+            ZEpZOGJkSzEyR2QxdStaTGZWejVZRXNCdEI0CjlVaCtBa1NZSkVJSXBBYlhhdUpU
+            ZmZZRHFrOE9xNTJjUHgyNkI0eHhncncKLS0tIGdiYXhsOForTUdrV0R1ODBDMHpp
+            TmdwdUtWbFoyajJYZmppZC8wbmZ5U00KU0yr0wZrUSU/zjbw0k40ya5M7Fm2Vs2k
+            wjCGOvXt7oNylm4qYev2sV3aBmgZLqZ5y+XjqGq/1Dx5NytGQ2v23g==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1p76577kkfttxxj8ckwwkhyhhz7qq2d7qf2lenyaa0g3v2gd3eecqhhf9jn
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLbGNJS1BWWGVBeloybWd6
+            S0czYzRlWnFQbUJMeFNCSzFMYkt4OTZwcHpzCmQwRG5tM1NYZFlKdWpxSEVyVnNE
+            cWM5MnNnRHFTVk1XNCt6dEZQWVhuMk0KLS0tIHMza0Q5aDJ2ZXBtTVo5RVM5ZkdU
+            NHhMMHFoTmtOTWhYSXRVM1BieWhPSzQKU8deBhU2/h7HEflAUqGljz+wcdERuMvE
+            UKJ+0a77Pti4DfkB1CnpnppWgL1cpxgmHSwLA2CcldpkDINaI+X45w==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1mpgtj57e256q9nqz8jt0jt9ntxrldu0p7aunxx3y5vnerfz04vqqdst2gt
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOcTNUaVd5NnE0aGtrWnRR
+            ZjBQc2JRRERwRXduSnRBL0wrQTdSWEV4VFY4ClVMNCtWT2tYUlljbFpUQURxRlh5
+            VEk5VEo2dDNYUk92ZC9OZ0orWDd0aWsKLS0tIHN6S1QxYVNsMGR3YVZwdWRpTWIv
+            dlZrQVhCcXlDV20zMmQzK2V1V0dCWDgKfdIVpat6/L88NDVwqce6DqKBcnFDxaUU
+            IyZZD0yiMX4psNVr5ek8okYb7OwQlBpp9oYp/tqan1/CP/gv9Wfi6Q==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1msgz4lzqj3wd4yu3mfgxyl5gz0y94al59njv8fqu7s0dvwt9yuvsctlhvu
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGYWtzeDRKai9pbUFGODBU
+            WVR3SEZ5NHk0R0FkWE9tOWRoN011czBabFFBClpWWGxGaVkwc1EzaWVzSGxjK2I1
+            QWpuUXo2a1REUXFrSEpKTW5obDBwUTQKLS0tIHNPL3FCbG83eHJRTlUvOCt3dlEw
+            Q1RKUlpwVHBvLzJyK25HZTlCQ0hFRVEKDAGaYCtZBP1P0jAbOfSGR7skgLSXwe2f
+            xyTOevsFapnQGBduQklPzTH6i2ArfNbkltGHLYMt0mHxsdqMixoASg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age10f7djsyu5fwew2l2x89a4st4qw4xdkyr3z7qd8frs54yqz7cayvqruttla
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnQlJCcVk0MCtpL2RvMUhF
+            WWxjdFhZc3BOMkkxazFaN3FLeDF1OEdEVkMwCllkc0xzVUFsTVhORU16bDM5TTI3
+            YzdLcFNrL3FZVmx2MS9KWWx5ZS9jNzgKLS0tIHdmTGRkdzQ4SFc5YXVxby85VVhD
+            dUVKMHRpdHB5MThyZ0sxR3JadU5IWU0KJdStma/nogBPjBwyyfhKR1KVmYTtBrx1
+            h52UTLSQhiQOBZBugadpcaqwC9pRv2NgXLemfEtO6eVvtouyX28hsQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age10f7djsyu5fwew2l2x89a4st4qw4xdkyr3z7qd8frs54yqz7cayvqruttla
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1TXZZaGdvOGRhb0NZZGgv
+            SXcrWXk4VHczZ0NheTdzMlJiMWJyRjZlem04CjREYWpxK2NzdW96V3FpeTBIZFVY
+            dWxJSXhTaEZpaEdQVGJDeTR1SzRJcWMKLS0tIC8ybUpyWjd0QlFqZHpVbzVkSGJ2
+            S09pYUJVbEdkNjc4V0gxRnVuNXFwWGcKgTzRnUTZA8oKzphegzjWRPJph8kOJ9HB
+            TsYOXJNqen3uwi1VpJ0vRe1Dz1owsmYbefqDFbieKFn4KEG17QUuVA==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1n09swn3qekcuw23vksp7hv4hpg0krlag3c5qcjjaf08m99c3ysqs6sxeyk
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwY29wZndTSkdMSmJnSlZ5
+            YURtUEN5ejUyMlVWbUtmVktiNzVqWjdabEZBCmZTbW50eERVZGtyK3hGTVFCMEtM
+            K0lkRlozc2dYTXVSVkd1K1NScG1MVDAKLS0tIDAvb3pOTmQrVFhjazc1T3MyYnU4
+            bVdNRGZCZUdyQ0lXVVN5YWRYdlBmeUUKxmW4j7SfMLjgfUR0x/nyJNL8zjglaYzS
+            /nPXL1ki4OaqkP9/R0SYnQls6ycw00hkLfO4ptsOjepX5rVAFFxODg==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1tt4c8t72fha2fj7xlm0dew5avmkdxujmgplte4qm7sxlcucggedq0eyk7t
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPYVo4eFFVUXl4S0JCQUE3
+            SHZRSUMxajhBRHMwbTFHei9ZZ3E0UnF4b1d3CnIyb2IvY0t1ZFpwTnh3dmJrVm4r
+            TUhmT0JnSlZiRExWUWxOR1JyY2ExUEUKLS0tIFd5WE1XUEU3RGEvWU5WSnpUR0kw
+            MGxzWTFDc01Hb3lhdU9rQ3N2akgzUFEKbKJOXiBDBmfIquMUW2MzTUL3VbkQA20u
+            4cXz5outQWeUcKEbiiuqJ/nBPRP2XluG7VvdLU/NoLiK9NP7sbpY5Q==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age108m6yx77k7aqcyesy4zmkulryzvyep6m92pflmldcnv3w5a0k9xqn5h7cx
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyNVF0WmIzWWFiMmxnZUNo
+            R1lhMHNQRUZBUGx5cEJRWDlnQTE4M3J3V1RnCklrQ1dsMExxVDNwVmJFeXozR0Jq
+            STlmMW1vWm1Za2ozaHN3dm82VVNma3cKLS0tIHpidFVOaXJzcWY4UjNreHF4ckhX
+            cHhHRGJIRDlsMEp2RzgxTWkyaWovbkEKnEzQrhYmdxjwa8bDGgVnHBoNXrdb8JDy
+            EOkYPEiHlscMfsGnUhbujoLXEveIrLzukWgKcRNmS5fTyG4e2eP/cw==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-01-01T16:13:02Z"
+    mac: ENC[AES256_GCM,data:YMQ2xiuiXoCAzuGGlm/KiEEjjZBHu7i+5Px2YibwSATBeEais9SZFqQx0qmIQw+VGdGAwVo8tQQ5Ikg5YJbHNEetanXbV1UJtMBBUb8m35lras+yXmeveOeKC/f46oa0DCPVuCDqkzEWOAk2NMZnfR5iuWBaZ6rvIhGnqlXodK8=,iv:UkTovxMi25Jfz8JzQE3W+Ar6w7ybBAJQG+9j6RWj/2M=,tag:RRSqNAv3OiMahG2oYZSJvA==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.7.3
--- a/nixos/boxes/cupsnet/ssh.nix
+++ b/nixos/boxes/cupsnet/ssh.nix
@ -0,0 +1,13 @@
+{
+  config,
+  pkgs,
+  ...
+}: let
+  port = 2222;
+in {
+  services.openssh = {
+    enable = true;
+    ports = [port];
+  };
+  networking.firewall.allowedTCPPorts = [port];
+}
--- a/nixos/boxes/vpsfree1/default.nix
+++ b/nixos/boxes/vpsfree1/default.nix
@ -9,7 +9,6 @@
    ./backups.nix
    ./cryptpad.nix
    ./foundryvtt.nix
-    ./gitea.nix
    ./mastodon.nix
    ./rss.nix
    ./ssh.nix
--- a/nixos/boxes/vpsfree1/gitea.sops
+++ b/nixos/boxes/vpsfree1/gitea.sops
@ -1,52 +0,0 @@
-{
-	"data": "ENC[AES256_GCM,data:XmBUUnZFfIIOI9Thu5ZbBbwcr+V7Zm/jgJTeO+xNFWGzr/KETXu2MJiyDvxWF7p/xnrUjkA1TdafTaTp3E/d0LJUNMHfWhVru802RnGYR7h+uwwM3hCPgek3cV0URpu97IlyGJwt+yWdz4/tsFB8gJe/U6qWM3Yo3P6f0RLuDCQG9d0NHj0i5Xy9jBYSLyOLU/648PQFzyJNwbDGeVbhRoP1it449+xxtt6Wye6Tw0VPD6MTN1TC+l85qg==,iv:kyCXCkXmTf2bAnV/iP6DYqAYJPXcgfQGVmQDpAGc3Es=,tag:h/O4rs30XKzu/TUnQSKMcQ==,type:str]",
-	"sops": {
-		"kms": null,
-		"gcp_kms": null,
-		"azure_kv": null,
-		"hc_vault": null,
-		"age": [
-			{
-				"recipient": "age1qpxvqf2254vynw7aah2pyd8tm0lqtfqr9maguewdj3uqjp8smqvssjp43n",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQNmlpRG14YVpOMmpTL0FV\nWE10TElmSnRuUmJkTDNkL1hpdHU1MzZlRUZrCldzenVWV1NOMmQ0RWJYZWZDblcv\nV0tBYUdpWktkSUlBZzhiVzBHd1pQTmMKLS0tIHFXdjFXWWllVmhjY3hJM215MG5h\nTlZySEl4UnVJNkxGeldpazFINUZ5YzgKqH1DqsVvBY+rQdk34jYFl4vaUkL+RbpY\narfGfgOQqmVohBKpMf31GB+MEiE05zNL5D3NdEJZ2sgukHwkw7CAFA==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1s3z2rfske90kt93a3z7twp6kew6mqd08sgunupym0gpmuh8ezqqscdrv7m",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvRVJLZ0ExNlVHN1padURn\nWWhWZHFUenhRUSsza2pFU25ZYkQ5dXZ4YUJZCjhEeEJ4aVZEM0g5VDczSlYyZjN1\nVFRxUStVdFAwQ3BkU3FDZGJrYzh2S2MKLS0tICtwQTRYbjdOT0RLdkRDZmVZbzI0\nT0dNRGNGcWxZdDg2bURlcTVzdWJaWUUKk02fxHEo8CLS4RrLBe2tY3RYzssYp/9v\n4NOM30EKOxiZi6RQ7Lk3M5CdjwiRO9zsqDn4pJhyhVqc+a97me+IjA==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1p76577kkfttxxj8ckwwkhyhhz7qq2d7qf2lenyaa0g3v2gd3eecqhhf9jn",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzKzFVYkJvNXQ1dEkwaDJD\nRkc0NVV6YjBYNkM2Uk0vY2F6NDZDSENIYnlBCmlQTjJHQUdqN2lBUTVIVGNTRkVw\nNW81eTNkZDFCTlV4enhwWjZpdmVoUG8KLS0tIC9zOEtLRXUxalorcEgwL0VPWlI0\ncEpkMFZQcUtpU3hFWElxa2thTW5XYkUKsTXkz+ZFvzxhr/Prah85PEeEBFNpiWN5\nDRkgRdCz9UoF1tyYEJZVsVuV/sUNgrLIPa4cvs4e4ErgmYGdiVKVfQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1mpgtj57e256q9nqz8jt0jt9ntxrldu0p7aunxx3y5vnerfz04vqqdst2gt",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0SHVhQUl1d1ArOUdzbEFH\nbDE1RTViNkRTdGxLY2FxaEhUZTM2YisxbVVZClJKT2d2OEE2cEo2b2F0U0ZCK3BQ\nZjBINVdzZncrVFpaZlF5SDF5VjlFaXcKLS0tIG9ZUkpqNkl6aHk3WVljOXNsTjBj\nN1BieUYwVTM1OWVaYjlhUFAvbHdzcWMKqLm9CUMgkicxYmXGzf9o8Y67+lv/OyRE\nQjqo2RsL+yjR2kN1hBKVLKkpm4rGnddmniPEVjbU1bzk5juFOqpnRA==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1msgz4lzqj3wd4yu3mfgxyl5gz0y94al59njv8fqu7s0dvwt9yuvsctlhvu",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBcGZ3VFZxQ0daNUlXelAy\nNlN2MlI1SlBsQlFxUHZtc2I5VllwRmp2YW5rCmtiOG9VL0ZoOVV5RUhNOTFFS2Vx\nZllWRjJyNHVvNm4xaDJ4VkhCTjI2RTAKLS0tIDRSNG1JT21Deks3ajJsbjMvcW1F\ndHppckVtMkJ4Q2RwWjg1alh2R2NDY0kKJ7a33iu1ZI93ditZzodNLkoEoZ0Nyzvt\nrwNhHv9y5k845WV0LW3ULRm3qbgMqSODj7WwWsJDOutNfoPLkXIqfg==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age10f7djsyu5fwew2l2x89a4st4qw4xdkyr3z7qd8frs54yqz7cayvqruttla",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIN1NSUUNnbFR6T1JxRWVB\nRzAyWm5JcEJFMVpsSk5mOHlVaitDeVFkNFU4CnhwWXpTM3diRXBETFZMRitKSjZu\neTl5ZDlzTThpenBFSmg1NGRJaEFQSEUKLS0tIExYRklhSndwdTUxWEFOdDBEbWRL\neVg1a3hHVFM2L3B0SlpEWTd5dmRTcmMKKxwij+C3jvtSt30Pd/5oTVql0YL1OKlx\nXnrpO7n6ejMP/1NYOH6VY24QAU23rR+LCQSqlXET0WMKgXLYZHjbiA==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age10f7djsyu5fwew2l2x89a4st4qw4xdkyr3z7qd8frs54yqz7cayvqruttla",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCZmEwTkdwUFpzSXdaa25Y\nd2pRZTVzbU9ZaWNYSmErMGVWV2NQNmFZWWkwClF5N1RLd3BDN3lZUVhJaWh6S1h3\nMjN2NktUYlJocFpub0Q5TklGMzM0OFkKLS0tIFBzSWNFZkwwVTVKdlBOMldDOStN\nZ0lYbHo1TnBLWDZ4bGU3alpXVjZjMVUKbk4v8qFMjkKOd+6ctT3JA86m9TIwjedR\n2CaMJTfgNhbRZJY0tn8Tg9r38eTMpGCibsIM9XAVp5gXhkMDSMFQ1A==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1n09swn3qekcuw23vksp7hv4hpg0krlag3c5qcjjaf08m99c3ysqs6sxeyk",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5d1RZYmNTT0tXWnRvZ1lJ\nQjliUTJBTktHdjJJVTA2ZVBNY1FDN0dSbno0ClR0QlVCRW56THJtNkluQnlYTVYw\ndkY0MUd4amRHdVFtYW1Tb0xWZmI5M0UKLS0tIHJzK29SSjVKeW5XZnNiNWNyZ3du\nKzE4b3pHSFVSQXZKOWhTRlBtRFJ1TXcKcohHoI8PXg8MaMigQ4InE+6YWl3ZDkn/\nuN/MwgYeQt/jJ/UIftUFgLqbaWWbvZsEFEPhHk53Ubm6ZnQeSl0N3g==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1tt4c8t72fha2fj7xlm0dew5avmkdxujmgplte4qm7sxlcucggedq0eyk7t",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqMU5LQ0ZXODhOd1RGU2hy\nK1pCc2VUcTVRYXJJYSt2RmlEMGlhZ25DekIwCnZBcDVuSngwakM0NVhreGJPZDBa\nbmpwdTc2bTJCVDFyM3owek90Vmhpck0KLS0tIHR0MDBJQW8zSytrdFFzc2lDNU03\nN2d6MTdWanBNZ1JHY3RVb042U1pJUzAKMcGJye9dQ2NhFO9DqRSm2XukE+OduDEg\n55YC1x7eAzLx6GCMMaFanplp4oLQdhZRn+rPMYNsbnNY+r84MhI/JA==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2022-11-08T13:52:31Z",
-		"mac": "ENC[AES256_GCM,data:BL45CVcKSb4Gb20Zo645kenNKpDVYgr7LXEnqbaWLXPAvNrlLFSJghN1e/o+Agmv/6+WM+ZT3/AOoXRBia/DvwvNKAkadwdTQieRMyRpgg6DfAYdqFhnzAeH8DtLsTvt6Jb0ZGDkRZODvKZCi8Ij43j/m5e2I94cVk94J2hUrVE=,iv:dfMnAJOoVUqbMz/iyDkddiPmUTAeWysMyf0EYsH93yo=,tag:xy/YB4J9GzNmSkWpEz6pTQ==,type:str]",
-		"pgp": null,
-		"unencrypted_suffix": "_unencrypted",
-		"version": "3.7.3"
-	}
-}
--- a/nixos/common.nix
+++ b/nixos/common.nix
@ -73,6 +73,12 @@ in {
    Host vpsfree1 vpsfree1.cyplo.dev vpsfree1.raptor-carp.ts.net
        HostName vpsfree1
        Port 2222
+    Host cupsnet.cyplo.dev
+        HostName cupsnet.cyplo.dev
+        Port 2222
+    Host cupsnet cupsnet.raptor-carp.ts.net
+        HostName cupsnet.raptor-carp.ts.net
+        Port 2222
    StrictHostKeyChecking=accept-new
  '';

--- a/nixos/tailscale/keys.sops.yaml
+++ b/nixos/tailscale/keys.sops.yaml
@ -1,13 +1,13 @@
-tailscale-key-foureighty: ENC[AES256_GCM,data:xb7EZ4TDLGXpstO2OTa+8gvK4206ik+DVQe2ZGqe+zxrhGsrkPu3MpjJYlL9vqakC4dzpRxwKN4=,iv:2Sq25zysjc2gS7SLi7QeFaIOtvKuBbNwADVyj7Hil50=,tag:65jC+Rk96s8xO+dKTo8uJg==,type:str]
-tailscale-key-foryog: ENC[AES256_GCM,data:k5Mwk/ghMwXG+erpQuzy8JxrhOrheOFT0qadd1c9UnsS4zphWUYjyELiG6ibvT01fYfQnAbZTFiI,iv:S4pPIIs6x3vwtTljKOqvM+OS/bEbxeRc5H6YoZjPPt0=,tag:t5AYKrLmp+mw0GP2TxRaKQ==,type:str]
-tailscale-key-bolty: ENC[AES256_GCM,data:IdbRiKm2Br0bFUgUKEh7uygEgC52FDBBuIiQR0OI1S+Ar+IMA9pEjfz70Ze4DdGGyATKpWsa6m0=,iv:ggHG+RJx8RkU+y48XzSsxeKgzUKQS7QPqwx0/k64ZyM=,tag:bblFibW6SHYIxJeNTd9H0A==,type:str]
-tailscale-key-vpsfree1: ENC[AES256_GCM,data:rNB+RONX52GUiDGm2c9AE1bGGuF6Cq+O8tEio4Wfm7+osKyKyQmCygsW5DUHOnEr8rL7nhSD0qj6,iv:q+0ZwAyurjBfcaAKuQI7VAXVqCsnm/EZf03JNBs1Ce8=,tag:PwdYLw6GqNNJqlLQuTwICw==,type:str]
-tailscale-key-vultr1: ENC[AES256_GCM,data:RRTgKN0uKXaPoObBcNL1zTlLr+XxhBT1EXbHFnU1yE13ihK4l57aVwgsE0YbYrBDmI0MgGeKH2ZY,iv:mbzfc98kHKJYAd/mWelRlLFH+WDj1C1P/h1+uKoPOpw=,tag:ElJjHFI7FKlSac5KVumtFw==,type:str]
-tailscale-key-yoga: ENC[AES256_GCM,data:p8n0AoQhqg9IrsMFHVaPa/4tbOghgGqPmWCoP2O9qtqKa7VWXIMYUirdV76jhcenMOvb6UOykhk8,iv:VbqKTg5ZwLgeE0sbCp5381QX0/QY7DXAkalWVFsWyoA=,tag:w+/Y5yU8dnzJ2+xO41nN2Q==,type:str]
-tailscale-key-mb1: ENC[AES256_GCM,data:S2neG5u49KbxcT+YBoiPwUheeeC/yts8orvVjY/75TWXNKnNlElaVtu9yySNdwo4kioJPw5LAzxq,iv:tLDdn70rvxI0FTaxLTTPVWQ5ct8Z8yq9SqrgOxlGCGA=,tag:88MW1ehQfPH2yqPKwJsK0Q==,type:str]
-tailscale-key-thinky: ENC[AES256_GCM,data:jhMFMqetLCBXuesK86623rY7jtRvnWYb6GS+5giXDWJxAQ7W+/9K47oQ8WHY+rNkcSTXBygimUk=,iv:5AVhcJzmgGpJtfo0fy299H2vQKVzEjDvCj22tTZcLVo=,tag:XYmUjTN8K2qu3dEkKtABuA==,type:str]
-tailscale-key-cupsnet: ENC[AES256_GCM,data:DDEZeixQ4LCsGAZFKy0c4bLecfZqIBZk1NjGf2UEPBp9qryHt/WV9N6zgxzl+vEl+QLZH1IH/+fA,iv:SoVL16N0fGZ7dYWkoxBfhjhKy0Qxi7otk1rgkbK2RPM=,tag:iwvEv1RPRHpRL7FTBR4tFQ==,type:str]
-tailscale-key-fixme: ENC[AES256_GCM,data:+S55wv2XGGTWuSO5rH/aQWgsSXUIKPmD+Q69O0P2LJHz9V+xAd0MEtk=,iv:/j2MxHG025lc8z3elehxwvMXN3YEcaKuGmDdWKEsJmI=,tag:50UBfo1YafrLozTei27R4g==,type:str]
+tailscale-key-foureighty: ENC[AES256_GCM,data:XL7c47YiOnjQuSrTfmHZlbJD3ZM45Tl1YmDX2EnBlJ2+TuXR02vQTms1bpJDnvUdpy832iparB4=,iv:2Sq25zysjc2gS7SLi7QeFaIOtvKuBbNwADVyj7Hil50=,tag:F2MDrFJEPh6r0yHtu5ztTg==,type:str]
+tailscale-key-foryog: ENC[AES256_GCM,data:x2CszX2CMspG8b9T+d7H7rOlPzV1Nd6qEboWC/o0XxSeLqNIcYRL0tHHCv4YSfI/0F2upRAYfnuv,iv:S4pPIIs6x3vwtTljKOqvM+OS/bEbxeRc5H6YoZjPPt0=,tag:aRlrqYfSKJpfpkYBwoJsJg==,type:str]
+tailscale-key-bolty: ENC[AES256_GCM,data:UUMmX+uzFhkZpT7GwCKvsr65JejhcIJm6v7U0MunZg7sPqzdo0psk0Ywuyvw2ytkL+n18l5v/5g=,iv:ggHG+RJx8RkU+y48XzSsxeKgzUKQS7QPqwx0/k64ZyM=,tag:j4cMVrDBTlu+OhAd1vig4w==,type:str]
+tailscale-key-vpsfree1: ENC[AES256_GCM,data:dAMjw+54wr6oBO7+ttnGrpXRMVhmYTbnMIsPa91+Mkf6llDP+Y7QIGIqyAAhqbb0H11tuoH7/FpU,iv:q+0ZwAyurjBfcaAKuQI7VAXVqCsnm/EZf03JNBs1Ce8=,tag:XaUt4V60nS54LyhP6Wk1rQ==,type:str]
+tailscale-key-vultr1: ENC[AES256_GCM,data:8otHa84Yx7sdMfnK6CBWGY5aEEk7ebNwP3Vgv9N5lAMdiOlAF2Vw6Hx9lX17StKhIlUjWkD1Vi+m,iv:mbzfc98kHKJYAd/mWelRlLFH+WDj1C1P/h1+uKoPOpw=,tag:aKkftniw4XNkPrBT+eqjhg==,type:str]
+tailscale-key-yoga: ENC[AES256_GCM,data:q2o5Y6vBdwx4yY456zGFfdq7oxWzQPCTIKpAoFBEch0CVlCo8sPk25Ddv4/FY+6HW2JrXW02CzKf,iv:VbqKTg5ZwLgeE0sbCp5381QX0/QY7DXAkalWVFsWyoA=,tag:JU5turYke0LIrrHcB5e2CA==,type:str]
+tailscale-key-mb1: ENC[AES256_GCM,data:caS2zSrgaGa38h/lCY/wxvH/diCTy0W08mOgr4i3f5BRGOOEHqJib0Nbk1W8N4kcq2bhOKgEl/oa,iv:tLDdn70rvxI0FTaxLTTPVWQ5ct8Z8yq9SqrgOxlGCGA=,tag:PozloYiuOc1z4BVRjPfhAg==,type:str]
+tailscale-key-thinky: ENC[AES256_GCM,data:JPBVgrOHlNK7iVhy5cshORpyL5QimTYFRjw03CvFI0TQopuhZ2KLo3UI4fHIbjkNe8m/5osJyrk=,iv:5AVhcJzmgGpJtfo0fy299H2vQKVzEjDvCj22tTZcLVo=,tag:E+lZFYs96jV7gTY1h/l7AQ==,type:str]
+tailscale-key-cupsnet: ENC[AES256_GCM,data:Oo0a1rKoE5VY3cCkadcFLcBkl/qmBVF9mQ/0Yw9ST4pyAi7M8HrqqIYWlBpBv065JAff5srnp6B8,iv:SoVL16N0fGZ7dYWkoxBfhjhKy0Qxi7otk1rgkbK2RPM=,tag:XVP2KbsOdJ5LgyPlTyQiow==,type:str]
+tailscale-key-fixme: ENC[AES256_GCM,data:Fp7nR/V2WBLo89CUwu3wguApa3ZcD3SXlFHOFteB6RoYy/rZxgfLwbY=,iv:/j2MxHG025lc8z3elehxwvMXN3YEcaKuGmDdWKEsJmI=,tag:AJpL350xYe+tpHSFwbzG2Q==,type:str]
 sops:
    kms: []
    gcp_kms: []
@ -17,104 +17,113 @@ sops:
        - recipient: age1qpxvqf2254vynw7aah2pyd8tm0lqtfqr9maguewdj3uqjp8smqvssjp43n
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVSGt3SXM0ZS84eUlBRnFt
-            eFFkWXYwU2xkRmFjbjlUcm1iN2cyYVBxZWc0CmFva3lTN25CdWtINEgyYzRWdnJj
-            Q21PczlQYlE5ZnFHZGkrclh6bGN1dmcKLS0tIC9oajRDdmgwT2RxYWFPR2grcXNi
-            R1VFWDd5S1IyYmUwNGUyeVJCNkN1eHcK2eP+c/Y2zPX9nAOrFMurDMEl6GKdoEmx
-            QY806kXXJHMhb6UUjKTsXgQGaOR1qhf7fex3Fu67Q5m8iaK89VXexA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArRm84WE9ZMWd1L3I1NUJE
+            alZ4SXpyekhOVjBNemN5TS9Yc09Zc3JQU2dJCjRTbkp3c3FlVzAxU2czNU5nVEh0
+            UzVrZmsrbFZQYVlQNEZlQzlrV3hzWTQKLS0tIER2Q3hrUGh1d1gzZlc0c2ROeWhU
+            aHVZMFJrcitYVlRkQmRsaHBaOXh2S00KcdyB012fKyZSWRmA+V3bLyjB7QcYhze8
+            gSn4kwtEIGRShr+CI81NQsrTOndY1SvjyeEn9fIVIjFGjwzCZ+yvlA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1s3z2rfske90kt93a3z7twp6kew6mqd08sgunupym0gpmuh8ezqqscdrv7m
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKa0NabGxYdmg0alBxeTda
-            NzRvbTRraFl2L3JhOWpNOVBrVTV3TDgwQjB3CitKR0U5OHRhWWEwVjNiTDhVYmJv
-            OTkyVlFMbDBFVTdkVzlraURreWNXbFkKLS0tIFVNdXpFNjZDQWIxTnBKaW5oMFl3
-            VjRhcmxQV1lvalNDSDZBQlludFRnSVEKUkp3MJ6R+4hesjhHpZlC1X/Zjz4KLqK2
-            EbwMLDbEW36NvV+fZ+rzdLGeP5nuaduSzGrHGgG5qgtcOkh9jZPn2g==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmNmxIVUVmQUh5bWpaRllD
+            ZDRNMU1ubHRvU3lVV3NHaGFkUllueUVCOWdnCnI5M3JhakRKNXY1UVp6N1V4K2xU
+            N0p0cXZFMDlXMEZ2S294N0JlMjA2WFEKLS0tIHl1NmprQWdsOTdwaGppSFZ6M3NX
+            R0tLMHJFajZVUzlKSDNWMmo5Ykd3aWMKafp/rte/Pqbt/x8oKtnc2ddwgpvZhBWu
+            DXkrGKXv1jLEPYSDsDXE34J41yL9Q/ao+JNTvABO/hreBuIeDZa36w==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1p76577kkfttxxj8ckwwkhyhhz7qq2d7qf2lenyaa0g3v2gd3eecqhhf9jn
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoaGNmSjlodkVibk92UUp6
-            bElzYytpSzcraHRkRFBFV1JKZ0dzSC8xcUd3Cm9KQi9QdjVpaWxJNk92c2tJVVVW
-            SU11VW5VWm5CcUkxeHVJb3poSC9MblkKLS0tIDdxNFJsRHlkRWdGRnpSZVJnSTNt
-            ckx0ZnpIaVA0cW5TSXdhY1Y0VEJ1eE0KyLoE26M9/MFG+kEzryjtoYUvvWrtGg9O
-            lZfHRzYixHtibZZiaPf5Okqv04iLTUDuDi3BZzy1+iC3WbyDzbUuQg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvanlZODNONWhGSW1HTzBZ
+            RHg5VEFNdVpSRmNidXdiTUJLZTZ5VE0yWEQ0CnZwZDluUy9JYU1SdHRHOFpWNnVE
+            eUJNVEJ3VUpCMjE4ZWo4M0N3cGc5YVUKLS0tIE9iWUZGd0oxSXQ2Z0hLaHZBM0ZP
+            bXlIem1WQnFPTTJGVllTZFM0Wmk4QW8KaccKh9Sv/mEn7FjRntFU53hjJF+1Rgyx
+            WcoTZvhfLrei20VzxHNmH0xNjh/J0SB4Hh4eoI6RXXxnX6fHuoiMBQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1mpgtj57e256q9nqz8jt0jt9ntxrldu0p7aunxx3y5vnerfz04vqqdst2gt
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkcThnNTRNdEE1ekxYZTh6
-            eVgrc2hxelVYdERHakkyWEpuckxvUU1PMlVFCkpSdURLZ3BTZC9NaVcxUm9sT0Rn
-            S2tVMWkyVnJINEZ6ZTFaRmI3U2lDTWMKLS0tIEFSMjVSZ0VvaWNWZHp3Zi93RkpS
-            Zk1KR1dsMVROcVIwSHM4bWFEQXlGRnMKw4qlp537TWSkkNNW3OG+FAOoskOJ7RCt
-            2ey4BcpgBeQpT9+eRzE9C8lRkYe32L+vS0kXKtA+7E++YvwBnUv6sg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiR1V2SDhsN29LMlhMTGd3
+            K3l5MEE2d2xFR1hkL2xHcW1Ub3J6MFVXWkR3Cit4dmJNZGkzSnpLajdNN0VLL0VO
+            bjdBa2RQazUwNElWY1lPVkpMMmp2dW8KLS0tIGFtN0hycTJkTUthbktkbDNBMUE2
+            OUZ6d3R3MHdTV1JxbVQ0dDBuUENsTzQKcAlbxrbBvwpertT1zFdcfh5BDUbHfiAm
+            VRbaLi4I0LGv5TBfo+L2iv4IuoFVxMAiWosIKrwydLF5346W7nfNuw==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1msgz4lzqj3wd4yu3mfgxyl5gz0y94al59njv8fqu7s0dvwt9yuvsctlhvu
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjaEMvZFJFdWJWY1lXOUU0
-            d1V6bTZ2dC9FMDFIY2hVK0xKN093dUFsbzBZCnRHdSt4Tk5BRFpZZXJVeU5xbjFy
-            aE0zNGk1eTYyNE82VnVoa0dlb002cTQKLS0tIHB1cHVENWFndmdNaTRxTUhNZ0hV
-            cHhIbzU4UUZLcjBQb1JoM1lRQTJrVVkKozvhJp6Ook14Z50Kj0DOs7pChnHVaEj6
-            b6AF3DzEeb3TgOnYWXGeBlHqRCvtpZyJCOAFZNo34ryNKUpJH0+QFQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSQWNleG5rQUVyek4wWFFF
+            MnpuekRqNzhvN0huME9jbllETU5tbk1IckZNCnpJcmxjNm43SkxKYnJnc0hHVXdn
+            T092eE4zcGV6RHd2Mjk4SDJ4c21KUVEKLS0tIEdmdnNMWFVjV2xsd0RQZzFGTHRY
+            bDg4NFU3WkV6NDBMaFhFakJEWSs0b2cK4Y+qJaMTHM3ijuWJ8ilb2NzOQu1o9TsH
+            95CgwVUylId0AKZsEGM7DJ5EhmiBeLPVuoTFDNcJL2bF6rzkWGXAkg==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age10f7djsyu5fwew2l2x89a4st4qw4xdkyr3z7qd8frs54yqz7cayvqruttla
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2Q21zRlR1dWcycmV6bUtt
-            RFZ5VFRhZ2Jwc0Z3Ui9JTW9QSVNMSjI1MkdzCjVYS0JCMkF5Q3JaNll6VDlaYnZL
-            YzdJRUJwT2k3MkJrL0l1dVgyOFg5cDAKLS0tIE5tT0NYdFcwbXY2cFYrWjRVUVJa
-            dnc4V3lqWm51T1U3S1RQYnMxSGZMT2sK9r0gmkYoHChRHPrNVIO19aqF1kRjZAc+
-            7IFdD5s+afIAse+ErtKxwc1e6UCCo/ONHd7C4IrepFHODwHWln3oyQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvRCtYSWNmMWd6QmhUUFpN
+            QnlTQXU2Q0dST1ZHcVpOK2tVZWM0aksrd1hrCjhtRVBhSklKdUdJQm01Z0x5M1ZJ
+            RjIxSlNnZ3JxcDVEZW5jbG51S1VDNVkKLS0tIGE2UW1wWjBCZE5sMGdxTFNKbCtC
+            WHRERWptQnArbnN3ZWRiRGtlc0dBNkEKkD1+SwQwCPnDLBh9x4mGshO3XWTH1eLe
+            DIwT1o4OPwKHW7BL0vqQnu348G16rJ1p8D03TJpcRY0oWY/OWRl/yA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age15zh6dnh2r82t8aguvp230c8nsl2jwz65ezhmhkfpeeuanp5ajs3smu4ys3
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzRjAxaTlSTVlIeWdqMTJH
-            N29QRVJlRThKbXdHTzNzVG9DYUNGOXlScXdzCmhvcGdKbTQzN2FxRnpkbllFcVJn
-            NnZrRXAvdHJpN2lmQUNlZ1hXVnVQOUUKLS0tIHdCRFFDV1RqMDNPaGx6VTBzbGw2
-            aUM2a2xCZkUzakJWdWRtekFsVFVEejAKAyh3NZKLJ7u7GkyquJJfgRaFBWhPjLfD
-            AFXfVXpFH5Bv7T5OKzLp3QETrfeTbZ+icvuDB/JCekdaYKtrkWf5vA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjSUJqQW5pYXczWHZyL3Ex
+            bGxqRlpzcEhXUnBnWjczajkzbDc2bVlBa2pBCm9GbUhXQ3YrUGlPRG1sMTMxQ0oz
+            a0ZEbHRZREk0a3gxUmFKTHoySVdWQkEKLS0tIDBQWkgvMEgxd2VqdWUzdDhVSFlD
+            cGZqcWtxU0lzbnJ0RGdXTFhiWHpQQ2sKvVCLLmseBAVzt3DRl/ngXbIzYvIBouwx
+            y4WMUEw2u5sDNfnb0pixP2LKwm/TI+HgQ6+I0FNoLAupm//8N9GaMA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1n09swn3qekcuw23vksp7hv4hpg0krlag3c5qcjjaf08m99c3ysqs6sxeyk
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiaktQQlJFT3oyNk1jNmUw
-            VXZGVkdaeXFZVDdSaEFhdTN5cFVsbThQZVVZCi9VRTR4NmpRSk9NTWVlVFEyK0pX
-            TVU1MGhFZlRtN250MWdWdEFOZTRETk0KLS0tIHJTTHViTUJuVmd4TmFXQVZpNC9a
-            K1ZQYTVJY3ZmTUM5Wm1zc0FRb0xYR0kKg5OYO7v0tuQUAYML3eBzvuvjLS21Ym6E
-            yDvjwTvZ6ifIAuR01XruXdAl2ojEkskCNYNRhT93XMSXC7GbFec8Rw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvTkNyM0Z4Y3NDSDRDT01m
+            Y0QwMGhaZUtFOVBrS0ZIcUlNVUJtWW1Belg4CjNLNkZhU1NrRW9kZ1haTjhGUHVB
+            QVFkRzlRYnZiOFZ0RjgzSEcvQXMzVUkKLS0tIE1zUG5FMmU5QlJrWXZmZjdlQmY1
+            dFVkZEJjMG5UQUF6R3Rleld5NTFjNEUK2r40uV0PDCaMa5AuL4fva8jz9Q8yHaAE
+            QIalWYlSkH7L5bYBAWBttXDp5WG8D9ZtiRxZvjqJYAhb0nLDDAIPTA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1n09swn3qekcuw23vksp7hv4hpg0krlag3c5qcjjaf08m99c3ysqs6sxeyk
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrTHBtUTQzcFQ2azZtMFo1
-            aXh4ZmZKTVZycnBMMHUxdlcvc1NHUkgwaVQ0Ci9KL3d0dDBrSXRjL1AwVnhWWi9r
-            cmg1TGhydkROR0dEa1RBZmRoYS9vZUEKLS0tIFV3akw3TFF4WW1xMUl4MTQ5bnMz
-            V2ZEOFloa2JuTjlzUDVyRzZTM1dGUmsK4/x6tIp8gsmQKVUqBI7G49Kld/m6Odro
-            wThpHxM2YnYIePQXb43GHbqSSLDg36dj5PwXqHSLGKTRvFd3JPgu/w==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZUG5FR3pDMUk5eXN4eDh2
+            OE04NHAzWTRCZWpBM2h5WFdER3Nsc2VlTGljClFtMGxtVi94aS9PcHg4a3hkbksv
+            eno4N1RyNytFVUxhREZuSWRaNWI2WjgKLS0tIERqajF0R2o3dmJaUEh0RFY4VnpF
+            SDdHSXU2c3hnUFB4UlBCM1NtaTB6bWsKW41FGHCnCcvR0z0Q5IZufirPYbv4a06U
+            5tdnEK9YhzV5rzMJ4Q2Jfjdo5VaTePtbEZT/vB97JXzu1MbTyrGBQA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1tt4c8t72fha2fj7xlm0dew5avmkdxujmgplte4qm7sxlcucggedq0eyk7t
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5NFFQWWIvQ0doRnczQjdq
-            MERyR0NIMk1KK3FyWjJRVWF5UjFYRFJpQWdnCmlkMjJ5L0Zrd1dNTm1iUk5DTlkr
-            WGpoOFZsRHJOaGMvSmlxU3cvelB2M1kKLS0tIGg5cnZrbFJnem0vczhEdUVVTHVx
-            MHo0VEVNakZPMy9TWkRudWRqQ2V3ZmsKRNmA72KvVXo+na0ZWJGG97hP9jhd3Seg
-            mgPgILY1YaHeXYlWI633xNBBYGVw+R6ejLdBKgQO3Lrw/0q4DczEjg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1Rm56UTBocUdaQXpBclp2
+            aXBFc3lpWFBUeEFMKzBYTm9KU04yYUpxU1ZvCkZhWWU0Q0NnRFc4dHJKVUhITTlK
+            N3NoZ2VHekpPSHM5Z3BCRlhzR0NKdm8KLS0tIEova1o3aXFHVS9mUDBTWDRHdTFK
+            ZjBFUjNQZFdnVEozNGJ6R1FoV3dNaTAKLOlxl62+4T0HWj/pKArTPQiZxjX41baA
+            jfF3xin5C/+DFnkluWOI3YuoN6BmDebwYHW15lSftE98islRrLmOzg==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age18vg9wvmj2jc8tdcyc202v46lvfndqfe3dse2hewx0snalpvk43fqc22n6y
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvVmwwYlZwNUJJUTR4cisw
-            cWZPZ0NVbm9KSllEMldvVmRqMlgvdTg2Q3c4CmpDUkswanBtMXNzbDFSVUZCbVAr
-            bkdhLy9LL2NtSnJNM1BkSERVTWROZ0EKLS0tIDkxaEhrNVBnZ3VYRkdyNE5vL3U4
-            eDU3UnhLZWZnYkpwVWd1RWxSOWh3d2sKhtvrXSDt+IU6R9c/kJ9bM1lbmzPZmiXh
-            UYMyAqjLY906HafUf6GkbDTmdVA0CI11jcxtLPxb95tP1IvsG/YFKg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKZkcvL2craGpjc2N4YnNY
+            T1U3c3hKZVptbmZqZWNySEV2dHB6S1kzaTJNCjJ3UFBDK2cwMW91RXkvbmpvWXMv
+            UGVOK1NWTk5YRVNUZUFjTEpyVmZxcnMKLS0tIGdlc2pVZjVPK25rcXdsZUFlcmZD
+            blgzUVJkc2pTcmNrN0RmeGlzeVp0SnMKw0AGcy7D2t+IpFrY30rO8tArGyHRERef
+            2CovXwKI9WVN1H1ZmkMFtQCZSK1yEAxf0qXRpucmA1NE+pG0uxTwsg==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-01-01T13:38:21Z"
-    mac: ENC[AES256_GCM,data:flXlr85oCD1IEqWX+kIljk1bO1LssxjoKuWO4iZqWf5HUcxojofjO4gTDxXKBIDi0R5B0XnZh0RrZ6fw2CiTzV/YwoaGmbqnFIvyKV8pQrSbINBqh351ZZDsrtG4gDANJmaV0RdS7Iu7EM7Fx/KpQ2VN8tGoyKf4fn7TtmZZu78=,iv:FI2R4nQfBL7NQpP8xycWgrG7ATfmUxqvZIcG3QC2QBA=,tag:Mzhvk5LxZuwUU5rj208wYw==,type:str]
+        - recipient: age108m6yx77k7aqcyesy4zmkulryzvyep6m92pflmldcnv3w5a0k9xqn5h7cx
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJTThjekJSZ2RZNWw4UThr
+            QXZOaFdydGJuemlnWngreUhIdmtpQXdxS2o0CllhK1dZbHU3Zk9RTzRLL1IzcC9v
+            aERKeW53ckxSQTFkVWFtcG9aTm5vcEkKLS0tIHNGS2lIdGtlZDZLMFJ1VmdpSFJ6
+            K1hCdUZHdTNHQWVqM1dMTWNXbCtCUlEKG5axHkD1MF4+ASHOSb+hVupkrIb9XHdI
+            RW27aWl/BfbgsipoacjzbvNBn8SMV2ERyFl8QdYpitjxbEbDsXzP4Q==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-01-01T16:20:32Z"
+    mac: ENC[AES256_GCM,data:H8DEq83OJkENl2UbIJ+Jcu4/2vW3+PJaOQn6uJSH1sVC+AaXH1TexyWyvhyACD+ZsshVHl/P+I5znUyRq05fpyzkqv1sKDtv0JEQCw2yf2douv+qcxp2VASZ84FUyeqx2ME8VvaG43jQPy1CjEco7mRJGeQfkd9iEFaMkZ9tzG0=,iv:dXOtCeyv4DUxmprdX8ZtUke8hXWII8idaQukPre16L8=,tag:GBuhxFQ+7ClPV0KgtIbUOA==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.8.1