Cleanup borg and xray secrets

.sops.yaml

@@ -2,6 +2,10 @@ creation_rules:
   - path_regex: hosts/common/secrets.*
     key_groups:
       - age:
+        # bifrost
+        - age1rs5rev3ks20s67052nshr5asqctvylrlytksjrfsns8e93t78dssr7wzg9
+        # niflheim
+        - age1rs5rev3ks20s67052nshr5asqctvylrlytksjrfsns8e93t78dssr7wzg9
         # carbon
         - age10ewrmr20gy5pc74tyygws7z80jmh4yn5f4e4sh96mznrvw347ecqjc2ms7
         # altdesk
@@ -11,7 +15,23 @@ creation_rules:
         # alapshin-at-carbon
         - age18cxypcgpy8ln3sch0j20thaps65w7nrtv6jvt3rrm5gysldq2vrqzgjf09
         # alapshin-at-altdesk
-        - age1sfed5wmvj00snjxrtds0zt83kt7ffek6mdtgfykum6uzxnphwg4qp5rv2l 
+        - age1sfed5wmvj00snjxrtds0zt83kt7ffek6mdtgfykum6uzxnphwg4qp5rv2l
+        # alapshin-at-desktop
+        - age1k2t56rsp2xvdsvjxraytyfufedxcl7z548tc9dzdhzqpq9yyfc9sz2h70e
+
+  - path_regex: hosts/personal/secrets.*
+    key_groups:
+      - age:
+        # carbon
+        - age10ewrmr20gy5pc74tyygws7z80jmh4yn5f4e4sh96mznrvw347ecqjc2ms7
+        # altdesk
+        - age1gwk0m9n4mrr7h572kkjxtkkl4p0t2mfc9f7ms0560s63x4pawgzq433tca
+        # desktop
+        - age18y57gdahad7zhrrgj2m4dd7fcgwfn4gpmxe9mhcrue8suq8e8c3stzd0ge
+        # alapshin-at-carbon
+        - age18cxypcgpy8ln3sch0j20thaps65w7nrtv6jvt3rrm5gysldq2vrqzgjf09
+        # alapshin-at-altdesk
+        - age1sfed5wmvj00snjxrtds0zt83kt7ffek6mdtgfykum6uzxnphwg4qp5rv2l
         # alapshin-at-desktop
         - age1k2t56rsp2xvdsvjxraytyfufedxcl7z548tc9dzdhzqpq9yyfc9sz2h70e
 
@@ -65,6 +85,6 @@ creation_rules:
         # alapshin-at-carbon
         - age18cxypcgpy8ln3sch0j20thaps65w7nrtv6jvt3rrm5gysldq2vrqzgjf09
         # alapshin-at-altdesk
-        - age1sfed5wmvj00snjxrtds0zt83kt7ffek6mdtgfykum6uzxnphwg4qp5rv2l 
+        - age1sfed5wmvj00snjxrtds0zt83kt7ffek6mdtgfykum6uzxnphwg4qp5rv2l
         # alapshin-at-desktop
         - age1k2t56rsp2xvdsvjxraytyfufedxcl7z548tc9dzdhzqpq9yyfc9sz2h70e

hosts/carbon/backup.nix

@@ -2,9 +2,10 @@
 {
   sops.secrets = {
     "borg/passphrase" = {
-      sopsFile = lib.mkForce ./secrets/borg/passphrase.yaml;
+      sopsFile = ./secrets/borg/passphrase.yaml;
     };
   };
+
   services.borgbackup.jobs = {
     default = {
       paths = [

hosts/common/backup.nix

@@ -24,7 +24,7 @@ in
     };
   };
 
-  services.borgbackup.jobs = {
+  services.borgbackup.jobs = lib.mkDefault {
     ${jobname} = {
       repo = "ssh://${user}@${host}:23/./borgbackup/${hostname}";
       paths = [ ];

hosts/common/default.nix

@@ -12,7 +12,6 @@
     ./secrets.nix
     ./services.nix
     ./networking.nix
-    ./xray-client.nix
   ];
 
   boot = {

hosts/common/secrets.yaml

@@ -1,70 +0,0 @@
-xray:
-    vless_user_id: ENC[AES256_GCM,data:nmmmjCS5JJwymFEC3TyfSfQhMwPvKrtmUjpjis6LqE48gBMI,iv:WHAFqA/T5Ukn6pIwQjhXQ+mGkOFMvi4Q0svOkROXVV4=,tag:Caq9+VhUF8sHEVEErgaFdw==,type:str]
-    vless_public_key: ENC[AES256_GCM,data:3tzJjJhPShm8dfYYIMUL2czAflzEiENc8zIrcShX+/DT13tEl+Du6+KgdA==,iv:zlS+PDpiFgvMONEXtDMZc005wyAG0H5zcPoxqAzzneI=,tag:ND0yLEKGbyFIva0jZvU9pg==,type:str]
-    vless_private_key: ENC[AES256_GCM,data:0ikHI3IFsmUmH+QdbyC8REL3FB/vvdYk2r71dfi7oLkLYSFdFSvPWBzC0A==,iv:gG5m45NEBpUbmfQj3Saeu1KyH97PQOLc8n3fTtzzFho=,tag:LFjyfi/fwFPcbO0I8C43DQ==,type:str]
-    shadowsocks_password: ENC[AES256_GCM,data:FxtDPmaeGlS7N0w7Az6QodQ554T8a9Xy,iv:ovw08lv66Ah9oyHaXV5VCpKyOmtJIsYAExMMbQ2xmh4=,tag:uZTmosgtRFAb8wXsx5B3GQ==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age10ewrmr20gy5pc74tyygws7z80jmh4yn5f4e4sh96mznrvw347ecqjc2ms7
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkSm9zZDg4cnpTbjRYV2c3
-            VmxwbWdlMGxlamk2QzhqMjZscE9SWDlGOGpVCnllSjlwdE96TVZFR0FYVlhmaFRw
-            SEJkYy9JQjVFZlF6REh4alQ1Sy8yYUUKLS0tIGNFN2hoR1MzdjlBNDNpZlJqdFBp
-            MnpibXpUOEVBZ0F3ek1rZjRST2ZlQmcKnxPs5j788ATDk3fSPCJA4kRlkLqywmXV
-            eoe5voOK1ukAToWZmYDK0Af0w7dcqtGoXD6BQlStjQqrPyhL7pnVhg==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1gwk0m9n4mrr7h572kkjxtkkl4p0t2mfc9f7ms0560s63x4pawgzq433tca
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBR21hc2FyT0pNaUtPMlZJ
-            SyttNnB5NkxFdGgvTEx1T3FuSENCYXZXNEUwCnkwczkzR3JNQTdoSnhLK0c3ajBP
-            VzQ1U1lhUVY1N2xRZ2xMMnc3aU5mSjQKLS0tIG52R0NZVTFwWjlpNmM0NytsMnJO
-            Vi9MbW1aOWN6b3UrMEtMZEVNR2xCeDAKxq/X+njL7GLXoT0F6mFD1QeakmJPj0lF
-            QLz8+2Cf7ah3x2JHcRNZTCDFEHFPC/2bify7PMuMsdgmGvkTAMU7dQ==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age18y57gdahad7zhrrgj2m4dd7fcgwfn4gpmxe9mhcrue8suq8e8c3stzd0ge
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmYld2d3VueTlDK0lrNER5
-            N3FoUUJSSGV3RFhLM0NsNDNCNW5Ua0Y1NTNzCm95QXJoUHlkUHBuRWFjc1VxY3ZS
-            Z3E4dkZmZk5RTVhGOHBiemRLZVJxSjAKLS0tIGg0aGtSeGNxWG85TUZseFU5WU5M
-            Y0RMMjdleEhheEg5bTBFWXNNbnFxZ3cKFdgBkuyALNFciWfLD7m5xhf5g+xdtENL
-            RipkMD0sQMs5NzItlB1K+dDJj12Io6Foj1S1D6pnLWt9ksGUa4sCdg==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age18cxypcgpy8ln3sch0j20thaps65w7nrtv6jvt3rrm5gysldq2vrqzgjf09
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyZHZVVE1RY2ZsSFRxeFh5
-            V3kvV1VKc0poWlRTamhQM3VoVUIzdEdYWUhrCkZlTEdrTjUxTWVUYS9QL09EWit6
-            Mm9aRGpkaXdmVXhzaVZoUGk0dzRjbTgKLS0tIElJNklpWnduL3VaVWtNenMxNXVB
-            SFNrRnlLdVI0Rnh5UnNiTjVQNTFmSG8Ktj1Minv/5bAAgJNLHJXTS0bVo0oyTqCZ
-            fSro/ii89r9aVG5ueyXOYZ1FZk+ORJJbjFBzu1MjG9wkuht27SuKIA==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1sfed5wmvj00snjxrtds0zt83kt7ffek6mdtgfykum6uzxnphwg4qp5rv2l
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBER0Zyd1YvYVFzdkQrUFBo
-            eFZRQ3VYdTZrR01mZTY2SHNiNVpuRGcyVWd3CmEwVkdIRUd3U2Mxd0EvOExnUGFB
-            R1oxeUZNcDQ0dk5pelE3MVVrNnphV0kKLS0tIDRTRGF2WkdzWFVMdE9MKzVWQWFh
-            UG4rL3NuSlkwRk9oK3BVSkRDVGM3R28KdCEiwB40NjKa0MPlaa9Z83wtlQrGqH6y
-            RaF+Nj2HeNIL9oZCj+hVGUtlnEOtXFp3tITYIf4X0LDQbqijCqJZLA==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1k2t56rsp2xvdsvjxraytyfufedxcl7z548tc9dzdhzqpq9yyfc9sz2h70e
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBieXFXcGNDKzFWM0lReUIz
-            QlFTWHl5RVVaeUJvcGFSZkFUWnlJSnFMb1VzCitqVVRleE9qdWM0ejhFSTJ0aHJY
-            enlxOXRmeTdTN3cvc1Q2UWw0TnN4REUKLS0tIHF6b1FqYVl0NnRMUzRkMWxvTFVZ
-            UzRPMTZydm04elNXVlNSR3VLVGhSbjAKjF547zdKTCQwgXq4orgVY2p2zmWnH8cm
-            pgKV9i1QSXcBexe+DdAIZaY/VdPtl1n4eDBAZgAEM+efB5L1RICWvQ==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-01-19T19:48:00Z"
-    mac: ENC[AES256_GCM,data:vCSC+9LpA88DRmn9+pzRYa4Jy6MwlJxQ8VyN+Hb2Zq2MkjuwdkfKOJCiW8rbKJDJAKAQEXNuKf5F+GdPnROm8X/YeLIWz4hHGcYYgRCi2edpVRZ5IopPiVTbfnEilZroItPHLhZ4175F4ISfFIBgHWNZr++mmAJxxrFhDcSvvno=,iv:h5IrehHL4CZk3o2cLFIKRDb6Z2irtx1zoCA0vALNcyg=,tag:Pl71Yizx1S6dToRoPssF7A==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1

hosts/common/secrets/borg/borg_ed25519

@@ -6,29 +6,33 @@
 		"azure_kv": null,
 		"hc_vault": null,
 		"age": [
+			{
+				"recipient": "age1rs5rev3ks20s67052nshr5asqctvylrlytksjrfsns8e93t78dssr7wzg9",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFdDRRTHhxdFlkd0xid1Y0\nb1ZiVmFCK0duU3g2NXJzdE5rVytFTWgySWdzCmt5Mk1VbktZWmF1azUrV2ExaDFk\nTnJZNHhWSy93dTZ4dUczRjU4ay9zbUEKLS0tIEdkV1JaQlRORXpPcUNWd0xTeW5O\nNTVWMSs5MXVIL2NxVEh1dHM4eFFjOVEKJamDaXZSlD/UZxEbYDDs/lJfVp/69S4y\n/unWWDMw57eWdmoZzuS2pd6pOwDoCkCsGpMJo6c/WAUUNB8zA8oyxw==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
 			{
 				"recipient": "age10ewrmr20gy5pc74tyygws7z80jmh4yn5f4e4sh96mznrvw347ecqjc2ms7",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArNEdyZ1Mrd1NyU0dpWTRQ\nS0FxTTlZTDZTQ2xydnptaG5sdFplK0hTbkN3CmwwamVQV1JvU1ErZFVhWU5EMjZS\nYi9PMFlIS3FpY1VQdnB6aGhJeXpkaEUKLS0tIDJMVUowS1EwaDFoY2hNYm04c1RV\nVFVxK1I3WUgxdTIwZ25PemQyQ2ZzTlEKIXyNAMm+CFO4f3C9dcrRFfnXN853SxUv\nSBV4AuyZzUUhxh79y+AMT3QRDEVMmyr04ka6qrpCdqUG0IIFNZAJZw==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzc0I5NkhzRURiOG1XT0lz\nR25YNXByS1Q2TmcvZjlQR1FZSU1YYVo3Z3lvCmluK2psdGJ0R0EwMHdWOTJoSU9M\nUStpemsrV2taQjRJaGloWnNoSjhBd2sKLS0tIEN3RHg5VitmaWdOU1hQSnB4UTUy\nVkxIZGYxcVVGckxDcDJaRm9yZTl6UlUKAdTkmqZuNceOEglFNnD9Xn+KR5Q/cvw7\nTK/57SBmtQKMk8CigFTm/H6VirRD3wxe96Mx8mKKeYQtM1GYuCLhZQ==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1gwk0m9n4mrr7h572kkjxtkkl4p0t2mfc9f7ms0560s63x4pawgzq433tca",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKL1J5TGtUb1psL1N3SzMv\nai9vV0QvRjFsak9sSXlxd2tCRE1jZjIraFJFClY1dUg0bFVRZDQyZm84UHBYS3Qy\nV1Rpd05TR2hGbnJTdjkzdk9iSSs0c0UKLS0tIEl3K2c1ZGFKSDgzSlJtaTRuT0lx\nbmtsTTYvd2s5NTB3WlU3S1dZdnhlOUkKUQw43DF+q0kW4218Qa/tMphOrq0Xg/HI\npzR8ti6WG55xv0YHOofD0xDHqY2YRDwWp3fVBJeWKrtqVblh4/37Zw==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1ZC91L0xjYmgwQS91Sk5n\nb2wxMkxQbGwrNGdRWmozb2YzMWd4T0pUQVhFCmJWbGN3YmtlT2ErbW9LYmJ1UitQ\nU2RHTnZiSkw5ZFM2b1puMy9SMzk0TGcKLS0tIGRwLzdOaUZXUGJWbDZHQldxM2lz\nLzUwTHEwUzFwOFpFR2RuV2Q1UklhRncKr5CAeclwQM57Sjc0YdZUeSEs1/DeP9JV\n64Mp04MpQQoAqWhVZIRr/nHo6RfKj5f7trlYSaktOY94FaW9pVRIFg==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age18y57gdahad7zhrrgj2m4dd7fcgwfn4gpmxe9mhcrue8suq8e8c3stzd0ge",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJL0d4Q25vVVBpS0hoSHIw\nWEJaeEVzWTRqcyt2Mm5PZ2RGY0NLYzVSTmc0CjVIUU5XQ2tka0MyOG1ObUF4dmRO\nNThmNnhNQXpRYzI5MmNEaVo1QmF5YTAKLS0tIFJXYjdOd2ZoSGRnYWIzUElmTUV6\nckhMWm9vNTdHdlkzUVNLcW5CcCs0b28KqglxUebpHD8xyMvvmMtH41XG9iwYd/R+\nE6CeiFbtg20ePVUj58cKk00/+L5GC81XxrPCjXflRRWwvJ9lffrA6w==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjUjB4dVZLMUx4cHg2OFFX\nZ2lxTlZmdWJ0N2hoMmJ5U3dPZm5QNWZRSXk0ClR1Z3RqY3V3VG1FT3Z4T1UxYVRY\nRDV0aUZqVmRlcDlNb3FwWURKaEg5dEkKLS0tICtxekp0Z3ZmUklaRmg1MFIxZTBX\ncnRiUWRWQ2crUDdmWEhFSVd0OFZLSUUKlbkSouCRKU4rrwijJxt+WL+JNBwsVE01\nrw6Asp3ww85XHUh0PPohsb5xJv3mEdBGIDyvaBvG9E6f2VkC/sUHRg==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age18cxypcgpy8ln3sch0j20thaps65w7nrtv6jvt3rrm5gysldq2vrqzgjf09",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOU2hwTjZ6K3BrQWFsRlhN\nMWRpK3h5K1orM0FnTmNKMmhjWEZ2b0RERzFzCnFHaWU1ZE5WZE9rd3ZDMnN2dUtS\naWpadVBIMmQ0RTlVeGFjaE5XcWlIQmcKLS0tIEkxYnNrRnBOZmFpSXZxaVRmNkFa\nMkVyZ3FEaUlucEpPSzVsbGFIWHJ2ZjgKIa4tV4F2JblJSrMrIVVbEl+tFvXzoIDE\nNrYMec9pMj437wrkDgtiqtF4mvQY2D+ObXfnsUxal4jF8oD8e6QkbA==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1bjkwaWFEeGl0YzFlaUw1\nVUNLbngzak1LZHlpcHRSZTdLMUdRTUtnQ0dZCkwwaUVmZFUxVHlhdlJwTDhJbDJp\nM3FZRjhRY24vV2dNMkhwYzcwSkpOSHMKLS0tIHA1V0tqdGxZWHhzODVaWTdhY3pu\nanRzNVA5QU40bEZ1QkVYdy80UWF3VjgKN+lNuBHeWFnVK+trmO2MOYWYmApPJa9X\n4Ua84bpOuU6bN8djuB9HxYlKXNReaeABzQNwfTu1w+VS1Ij4gfRaqw==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1sfed5wmvj00snjxrtds0zt83kt7ffek6mdtgfykum6uzxnphwg4qp5rv2l",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSdWQyU3YveU82RkEzUTNN\nU2RnY2xVdGRCaGR3eFRRRkU0K3NYUmlreXk4ClhsVlcxUTlJN3lCM3N5eFBsb0xt\nQjJtMWJ2U0RsZFlOK3VKUUhSVUxadVkKLS0tIE5NdVdmYmtNK2M3VFRUYWxSejl3\nQ2hNK1U5eVg1SFRHZHZLRVFaQU1UVXMKbdQ01LgHtlt283cgc9feIsfYX/lWefml\nN5pLe+OP1w8adU//Vb6mNHxAaUMOisAEAWUaEDsnVQyd4+NQPjvydw==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArSTJhUUxlN2NRRWdERE9E\nQVdsOHloRjlmbWlMUjFTODErcjVvYnlJalVFCmY4SFpSTXU0TWpaM0Z5RTcxZ2Ez\nV3l0WnNFNC9aaGVSN3NDTno5a0I3OG8KLS0tIGZtWW0rZXlmdkZYS21zVUVFcTBB\nU1h4NVkwOG82TFR6OVFGSk5SSFZvZ1EKz7x1GssOJaHUmQR0jK1nuEyYCB6TdE1x\nhvAkNNmO9B037ttowuZZyLIqfNO0aJnHLjLfCvHzfD6OsR8XilFvNw==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1k2t56rsp2xvdsvjxraytyfufedxcl7z548tc9dzdhzqpq9yyfc9sz2h70e",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwZW5CSnFnWHRrRlNGVGJH\nSTc1R1ZobEtRY0ZsbHl3UE85cW84MHJURUVvCjZ5cUtQSHFOYVF6aE5KV210QnEz\ncjFVZnNiT3RTeG83ZXRDWENvV3R1UVkKLS0tIENzLzZIdFdMVW5ZQVNhZTY0MFlE\nZXNxQTdZOWpZMUxoWWVmM043Q2xtaEUK9UJXYZKmQE4/nLhmcp0ucdzu61+0Mmot\nrJQvHhAj3hJ1tDd4CnJvsgeQ0N3lYEo2tgUXAkS4f/xjGpN4ZQtCrA==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxRytXM3RvSXc1SVpMMXlV\nQTQ3YWVLdzFrejltM2M1UGFmdjVOdG5Ub2tjCmVSNlFkMk81STNDTVlIUSttQzZK\nM1VncCt1amtDSWRNMkxiNllYdEFKQjgKLS0tIFMxQkI4RGx2UkN1WXM5eHg1aXd0\nVzB6cWpjMHNORFVEbVBsS1d2QS9zZ0EKLrcCuJbgN/rF9WF14huPl1kSCjoYgVXA\ne+6hDL6Vq9mcXCoNmqjOgkO2KxBaMwuuT7NhXyQsxXXWjNWDL/UONw==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2022-08-03T10:59:34Z",

hosts/common/secrets/borg/borg_ed25519.pub

@@ -6,29 +6,33 @@
 		"azure_kv": null,
 		"hc_vault": null,
 		"age": [
+			{
+				"recipient": "age1rs5rev3ks20s67052nshr5asqctvylrlytksjrfsns8e93t78dssr7wzg9",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0YU0vY1BmYnFMTDlzSzB5\namdzdWdmUytwUkNNZXVZLzBFTEMxL3NsdGdvCnRtK0FMWGo1UVJrZlNCMXF1REx5\nQlJjbEMrQmlxY053NHlNNGplaGtKZGcKLS0tIFc0Qyt0dWpCbWFaUDl2ZGVjU2hq\nRVp6ZGZOeGF4ajlIQm9nSGlxT0Nnc0kKSglv3vUrM5KHMGqxtocBsgOLzuZhSAXY\nHdeKtwJxy3cVWQmU9rouqVzR6Vin1lfv9EYUPsWv04wyxZVaZbN7Qw==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
 			{
 				"recipient": "age10ewrmr20gy5pc74tyygws7z80jmh4yn5f4e4sh96mznrvw347ecqjc2ms7",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjMjZWZ0svdWdOVHliQzY4\nbGFKdlpHQ1NmL00vOEtLMFhQa1ZIUlRSVmdrClptM2I2dGx6WmdmcFhvZlhBM3Q4\naUE0MSs5MlNLVHdzeUJ0Tzc0NEUxcVEKLS0tIEdJZ09BMktTcXl0UTl6MmFxdVNC\nd2xkTWJTOTFDcE9JK21Oa1hxZVB1cUEKO/7rP6Mrz+jxpmOv8DY1D8/FfYUjL0Ir\ngpch6q21dAOfg/MRQxd3ZERoiAh0wcS1XR15Kr+A+NraaAvlYTIBXQ==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJbDhCdkpmalNkZ1F1L0tz\nVXBqTm1MREhsWmMyMk55NEc4VlRtRVNTaW1NClk5UmRndlRqVUFtZnFZQUJKbEty\nRFBXRTN5RzNLZEZSMUI2QmZGalhpK3MKLS0tIFJtUVBwSWk3Yjk1NGVXb2FBWXEx\nZFFCOXNlckJ5TDhRbFpOdjM2V3UyKzQK+TsxrEpPzzQkZrbiOafcjKQyk4n2Uas5\ng89zrevoJxDSpU0Rw/AN2TqTl90fGFyAEkpz6Ksbk7g3XmTBo3jtoQ==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1gwk0m9n4mrr7h572kkjxtkkl4p0t2mfc9f7ms0560s63x4pawgzq433tca",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoeDY0WjArVDV4YldGak5r\nYWdnTktJTkJCdVJlclJBd1NPSEpxcDdHeW1FCkgzSUNmejd1cGlWY0hqRk5ZZ2pu\nUnoyTlBmaU54UE1yVWJaemYrU2VVTVUKLS0tIHhaLzh5SUFLblVWVkl2MDlXcWZY\nanVTcDRLa0tSTXllRFVUZlM0ZTN2bFEKUDADnp3Pxr4Ah9GNdpffb4WPnfM10Zk8\nqfcgKQRQfEp7MwPlhy/qrVM7STnVN4ln9rFkQ34ZXDG1NVMglhkxqw==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1Z2crUlUwTGk3WXc2cGEv\na0hmdzBOd0dGZWhlNGVybjc0UXQ0aXpRVmpJCm1ZY2NJNTcwWDRhRDlKQWliSUVS\nS3BLVWtjMUxNWkh3Z1k5S3htUFVGa0UKLS0tIGFFa0RLM0ptOW5VYUE4VGJFVVhI\nRGIrZDhDRUd1SHNLZ3JhcVFoNzI2TDgKkuy3cttu3dntDc71VeoDhrRHa/6STAAX\n4klRVXzaSQXD8qsF5f8dlqKxP+Vo3HUW8JSguCB2Mg3OmlSUSworLw==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age18y57gdahad7zhrrgj2m4dd7fcgwfn4gpmxe9mhcrue8suq8e8c3stzd0ge",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGS09DZUZidWsraHRmVzQ0\namV1Rnl3dWtsR0lmR2pNSlZaVkhUdDM0dG1NClFLaTRxTHUvOHo3MkhkdEtnMzMx\nWUZrTk5OUDMwclFVcVcybUd6LzByNkUKLS0tIDFyNHJoeGh1OHVYbUUwYnNEbXRx\nNUVkSUltLzlqcFRUMUlYc0R4YzQ3dmMKol4oU0NU1Y6xy+BdnI8yT3J3iufm5ehN\ndxmLgxkPRMrMxzVfoDeTlKCQWPjAFmSiLXLdS3isI0sdhoQqphMbdw==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJbytVSXEyY3hVaUM2VVdu\nek1SZG5BQlkyV0V0VVFkK1VZMEpqN1QvZ0NRClpsRXhhVjkraG1Mck5jOWhjWGxI\nSnFmRzRzQ1Y2MFlyMXNUeWV2b0JxVncKLS0tIFdBNy9LcFVCbU50MzNjTTZDQ3h1\nUi9leXoyRGRzNHVWVHBWdVhrZ0lya00K6JBzESIoQc83eP/nU9NFlxhBm+Dgf62N\nLAwnfPrASOangHJ7gZYkM+ZE93GB93JUSTHgJbbt0YLgFZvruysMjQ==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age18cxypcgpy8ln3sch0j20thaps65w7nrtv6jvt3rrm5gysldq2vrqzgjf09",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvS2JDSzBwVFM5WFY4Q085\nZmNTdmlmaThUd293WVhaOU1iTmtYK2RxVG5rCkNqbWNWZ2NMK1MxVVpqTTdpOWc2\nNFhqV0h1VnhrcnUvbDJyaFBuT0s1U2cKLS0tIHJMQy9YV2ZKelVFWEFGYUdFMjdB\naUt1Y05WZXU5KzhVKzQ0SG5pOFg2RVEKf/SbB/oMbPglJL+jk4uGfOkXYz8GUO4Q\nXgWYd3JVGO+DpBmtPQTJkjERr3Ydfr4vGwPcCCkCDKkSRhVAig+wEA==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4azRSZ25wQm01eUZnakY3\nemJqcjdDTENOSlJ5ZVl1S1IzMUtabTVtN0cwCnlLTGVoMnpReU1RK1RZNlhYRThi\nK1pmRjdDWElsU2prWWdXNmp6WllaRmcKLS0tIGRzK1Y0TTRDOFd0d1NqTjJ4eHhB\nRE9mdkh1citWd1FKbW52N1M2dldtTG8KVCz+O9kLcQd7X5fABoRSkJv0Ao0zZu7+\nKA3R4F1eUChlLWROP9hZWHkKZZA+77w8QjWOAuGb6B97bg8EBH4Pcg==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1sfed5wmvj00snjxrtds0zt83kt7ffek6mdtgfykum6uzxnphwg4qp5rv2l",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCbXZSVEg4RHZtaGwzMzIw\nVlRIam5vUktxdDRiZWQ5K2NBZDczc1dDUmhJCm5yZGRSVm92MVYwTjBQdExFcG9T\ncmNvcWxVbnpwNVVaZ2Y3Z1VYb3FkMGcKLS0tIG9tMHE1cDRCdHlDU1ZrdXlndEFH\nVkp6WklLa2dodVFON1JKcnhKQUhPSDgKRZcqbOLvtalZK43kOF7Orksxv7NAKdxr\nYelsb48fO5BlcisZlLjkDpMTZRluqTAMvW6bn99YiTJvwIyfYYudSg==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIOU1vUFdsWldYT1FoZno4\nZW12eTU3SEpkZ0lUS1RYS0FJaE5SYlczUXlFCkl6MUhwQlJsQnFwY3VwQjZwS2ZI\nSkswL3dJV2diTGtGd3FpcnpiZXhsMmsKLS0tIEpHeE91bXJOVExMY1haQldVNXM4\nWUEvbmYvcUMxMGtUczJmQVFzalJiK28K6yEIqRmHPx3MS7zQ+Rfa0RHAUEi7ft7T\nuWwRcaubqpRWN2teFTEunfi6iQQeZXmQaug3HGFZx3c7OkDNvjfLcg==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1k2t56rsp2xvdsvjxraytyfufedxcl7z548tc9dzdhzqpq9yyfc9sz2h70e",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUeDkrWFNIMzJhZ1pSNWpm\nT1k5L3BYdHVCcFVxb2pjV083Z0ZrRE55UXhZCk1RN05MdWhVMEt1eHhGMUc5WlBW\nZEpuRGhLWTN3ZnJPQ05wSnIrd3E1TTQKLS0tIEJjOWlqV0pLeEV0QTQ0WWhUUVBE\nVzg5Yk9GcDY4dDBiajNta3V6Zm9HYTAKSAmecFSArHPZHbxYePXkFQJXzTPibJ4j\nZ1EamnKx3iaFb1pU1pVeZZk8x1eU7zekWUSv/TgKBr7vPEO0g8HLlA==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRVVdQVTJLNit6Z3lCaEFH\naU5RQkNpSmJRdU1LQVh1QVo1RkYrWVFkL2g0Cm8xSnB4U0dxd0gzR01ETkhSWkNX\nMkJyMFk5ZnFBN2NmVjQvQTBwbGpXOVUKLS0tIDJTbHpoUm0vZUhWall6RWlIa0JO\nczllTmhHNTdRWmJlY0VGN3R0L1VEalUKc+ef9/+m1XfNHKGev/szu4eKyItP3twv\nPAKPH7ygd/ts1pfH7PS+PbL7mj9kv5Vn/il5bQSlMzw4HEJYPvfPvw==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2022-08-03T11:00:23Z",