secrets/backup-archive: update structure

modules/nixos/tasks/backup-archive/default.nix

@@ -59,13 +59,13 @@ in
             secrets;
       in
       getSecrets {
-        "borg-patterns/home" = { };
-        "borg-patterns/etc" = { };
-        "borg-patterns/keys" = { };
-        "borg-patterns/remote-backup" = { };
-        "borg-repos/archive/password" = { };
-        "borg-repos/external-drive/password" = { };
-        "borg-repos/hetzner-box/password" = { };
+        "patterns/home" = { };
+        "patterns/etc" = { };
+        "patterns/keys" = { };
+        "patterns/remote-backup" = { };
+        "repos/archive/password" = { };
+        "repos/external-drive/password" = { };
+        "repos/hetzner-box/password" = { };
         "ssh-key" = { };
       };
 
@@ -78,11 +78,11 @@ in
       local-archive = borgJobCommonSetting
         {
           patterns = with config.sops; [
-            secrets."borg-backup/borg-patterns/home".path
-            secrets."borg-backup/borg-patterns/etc".path
-            secrets."borg-backup/borg-patterns/keys".path
+            secrets."borg-backup/patterns/home".path
+            secrets."borg-backup/patterns/etc".path
+            secrets."borg-backup/patterns/keys".path
           ];
-          passCommand = "cat ${config.sops.secrets."borg-backup/borg-repos/archive/password".path}";
+          passCommand = "cat ${config.sops.secrets."borg-backup/repos/archive/password".path}";
         } // {
         removableDevice = true;
         repo = "/mnt/archives/backups";
@@ -92,11 +92,11 @@ in
       local-external-drive = borgJobCommonSetting
         {
           patterns = with config.sops; [
-            secrets."borg-backup/borg-patterns/home".path
-            secrets."borg-backup/borg-patterns/etc".path
-            secrets."borg-backup/borg-patterns/keys".path
+            secrets."borg-backup/patterns/home".path
+            secrets."borg-backup/patterns/etc".path
+            secrets."borg-backup/patterns/keys".path
           ];
-          passCommand = "cat ${config.sops.secrets."borg-backup/borg-repos/external-drive/password".path}";
+          passCommand = "cat ${config.sops.secrets."borg-backup/repos/external-drive/password".path}";
         } // {
         removableDevice = true;
         repo = "/mnt/external-storage/backups";
@@ -106,9 +106,9 @@ in
       remote-backup-hetzner-box = borgJobCommonSetting
         {
           patterns = with config.sops; [
-            secrets."borg-backup/borg-patterns/remote-backup".path
+            secrets."borg-backup/patterns/remote-backup".path
           ];
-          passCommand = "cat ${config.sops.secrets."borg-backup/borg-repos/hetzner-box/password".path}";
+          passCommand = "cat ${config.sops.secrets."borg-backup/repos/hetzner-box/password".path}";
         } // {
         doInit = true;
         repo = "ssh://${hetzner-boxes-user}@${hetzner-boxes-server}:23/./borg/desktop/ni";

secrets/backup-archive.yaml

@@ -1,16 +1,16 @@
 ssh-key: ENC[AES256_GCM,data:MDKZC4QMcfoXLtmTQYUXmz7vAFVKhcLACiQp3DzyeIle3FykNuvD/i5TLmqDclMHAcIfBb7yOCTPL/+hIvXRbU25btqWTc/i48RjYTvbpkVKQyyb7lBCmgeMHPoFNpSeu+NluelUpicQv2zOhIgG+LInQsDSy6uZuEnAEDh/MkCrch9G5DOQ1fGFcmRnpReKPNShkFaEnwiT0iYfQ/ksAvJlRS+szphWCcP6phwGWINETXyIQVekvnPp4pcioFtQ2sIZoLEkcOnhloNoSXs/hrqDaxgbEc7biITy+FCDU0M/qMVHiS8pE9Sb443MpmCSx84pm+kcgRpKPLqhhcf/PB0wLLGDvBD4Wv+0cmgGdKEKaZxvoTcYuCplvMKfRCzOGCDliBUGEy9gU/E8QCNNxC1OokhJFPs0b6YiHTAv+n+z48lRMojaKfmA5sRhiAh2mbiQerga8Tf3pEhtDW2myR3zrXYsJH2201F1j8O4TSQrXjvwC4ZeaIrzC1zYHXbTlNykdopv++M9U5BxRptBrAG5MgoQablsV3cH,iv:mIXPJIZ1z9xnoja+zQcHvVLLCWn3YMdVFKkhadbWCjY=,tag:Z/c2LB/mTaY8MzDfLjLrDQ==,type:str]
-borg-repos:
+repos:
     archive:
-        password: ENC[AES256_GCM,data:XCWvZIYgxUYApn2hni7gtPkOiiv6Fc5WAyBjIhIbboGP1TPJ,iv:FfWqVC9KpDa+XBXFWgvzJDZL2gqAYPHtUT6mROheU68=,tag:xGE2zyYKMFO8x6aJELLAgw==,type:str]
+        password: ENC[AES256_GCM,data:SDeOjiMuHRNbUIozozzt2gPv1hA4fnhk1WPd9v2Hoj7FQd8G,iv:4EjrKKvFScYf5qc+ild3xxNOj7ueNQZFJRCtXk2PNMk=,tag:gaxzCzs/ZnSHTPwAos4Yow==,type:str]
     external-drive:
-        password: ENC[AES256_GCM,data:5qbA4HRzStX0rJ4fQv9KwfenUeE5PbKoIT3wCZ87M4YzVbQ+,iv:Odrgkb9FAZOOHU3R2CVRf7UdkqmGpZgCoz3ci/lgKjg=,tag:hyRu0OwlmM6nroqq0Yjj0A==,type:str]
+        password: ENC[AES256_GCM,data:BjL6PhkA9GYdSQEyHIrt00vA1JY9kLIqjHC6R2mUPuupbt1E,iv:37l5GTCxLPo3hOENHxZEH5CjcL6lP8sf5BoLA3YMXqM=,tag:LaMsCfaV4eVF0KBKnVlwlA==,type:str]
     hetzner-box:
-        password: ENC[AES256_GCM,data:me5czGtTEoiIr1qKh+GpNTLBRhG+3BVyj87t,iv:4ew7vTK38xEGXPIPm9I2BxsFwMqRHGJ5mtpN91Cfghg=,tag:HbI8jxQNbUz37L8H3T56+Q==,type:str]
-borg-patterns:
-    home: ENC[AES256_GCM,data:NXW0QN4sFTmbPB08Ww4J3pzn5RrOroqD2l/EyK3cHNcT9P6nz32j6nB3Qzx0Ik1CfuVFt38xQV/yUGkszCdj8GcLoOHi4Bu6xgBCmPqmNh8CaDg9jRdVBxUpf3UVfTJx9oVw0IL1qN2Rk28OqKqGhrxHQCMqzICRKrNaobTV0tOJq50B/8Hz5DzuBKO7fpf2VyNIqkM5B2VCKvYALgB7cpnq//Oz6BNsMiQe429axOcRWOyxSl/RSpCAmF74vCT9SRRB1Stb0xH0aiXxm5HXmSuQBjjERSfdFmlGsyaSD/9OscNA0amwHOmmeg7CuD+5cPaxgUlbDEgMwsXwyThKVw9LHWh5DPrjV627UZyJNVVYnTmApIW9DDJqX7rkP8pGRsoQZV/Fc2tQ5uSmDE4dOxxDh/60as8FVfR4+lhURhfAfZuuSrVd84SJFWvdYNRgqtYO2s2NER4/Syj/7/qCBsujpRTidIzjSaECSDAqwjL0JVNyIwAyaqvK4jDQHiK9aZ5Zv9Xu/7cfRVaEnHoe0/Dy/ZRVpZlELC7PlbpFHEY0vQ21quPpsSJPPj1i4RMAk5QHkJb8JxV1N/Qdv+3//bk9Hr3Hr+h/RmMygmQ1Q5Pin/dIgfpzo24ITRwDU7KXo4SP0EvdjhcIDo8AAopX7hFcKh5tluvZpTSgPP9ETlhoIuwQoqtqsVzKROcM88LPnEltticEDACejVo41zuszY4sLuLfkn+x7f6tfRTGansoaxLL6Xoxs6OZWzHQ/rCHONLFg67smjbdBpEKkwGH/8yh5VzIkkGjWlui0WHCn6AYhXw6neR0WWUqGkVMw/LFd9N6Ss8PlFjAWYbpMn3DFBO/Hl3yaPz7RRqVkuT7auSrj6MB+iRN6o5INL3JW4ZdHV/7tGQHm8B+WEjq3YYw3x8U6RrIANWrXjqZEK+tU1fLNZ80oZwTz7WkaiNQuO3oYWgoUMnvOSM+aM6aVjIm5itEjmfbWuHgR4lljl2XKJb25Gp7FEbn0XGjLy+wfgNKP/ZAAlhJVD1oWwvjYJ2o,iv:JhM40qLFXoJqA/BeUjMVYL/eWdoJrPhrRyiIR3acVwM=,tag:KGtAGSOcpvS9yCO2LyKFsA==,type:str]
-    etc: ENC[AES256_GCM,data:8Bq1/YP4XndDv5H4SS/wT8WLQyY5JPp5oErU+RpTqgSJqlSs8Q9aCZHHzd/zhmazgGZfCiTl5xLOgSw8lB7cqRfeasE64ffiafM7,iv:6wM1510XdECx9B/EEyICQxRj8fqZ8Tv6oFMoGMynmog=,tag:0uNmZtNGs6Z7QE4dbJZegg==,type:str]
-    keys: ENC[AES256_GCM,data:xIsfpYj7bt7+ZIq6gVA5s2tivF02odptG6TSsSP/FiVfe66UwDzDg7JOeVzFvtt1pZdYD7kllDHOuyBxo9AfYvMU0Aj4UJ0q5ivQqXRFmrWqSAUqbqQhVIGloW7zIQrRvyrABHkr9rFhPS7gpLNbJjYIqa6NRykHqqRcMX20A7P8mh5+Aspf/ulJ8Bwe+sx47ScI0EEbTdi8zbDkZNmxZOBgyvXHVKIiQyw11dmhuqLlXsPshv+y+WARYRW6xeTqA8aEzq7JgXLCZFHww3AAcrj0N2Ju26AN4n/czd5RY0LNWJE=,iv:mjZJLS6u7QRC7d/UXJbiFpkDcIIidweFsuHpc01p7m4=,tag:VFHIuM/Y3H5263Ae/kTy0Q==,type:str]
-    remote-backup: ENC[AES256_GCM,data:Iswio1h/dISD0McJRVsrWp/qEOfqdmv3iHegbIgVjRGEmyI2UzaIyMoHh+EEzGl6kMjD+v6bgMvrQjQhBzko0MlWbTgvHT0cB3TGnX0aOudn6x7MnonY08rcuSanDmAzO6OfdwaXB7uWDBTym289dLc6rZl1kWBfmMKXUh9JawyDuxHFdbMecyHqVd/6WM1AAAREX37d3uhx76ebsPXg8LZPexNeGtAF6lNlJsKg0wbAGrsY/dWVNoL1E4titq4/6Qz92VtEFTzWb58+xDdqNQACz8113JEr366cxarvTtQqlcPx0X7pAKMXLW4hNAdp2imRQPJuwA9sW1tALgRGfQOJ2+sctE2t/rl5lHsn8nm+LK7OWRucvGNiboUUmIqh/c1ydgRg79mskIQBqrS2LXZRF0TiNwc1f6c6N75IF7pgY9lFT3ZUwWXMBewbg63Z3E2KWE12bQ+swSj7PbCDapxjFSV4Gq/wQut6I6LAmFtPCIm+hHzzEWSdlpxJO4US1E2LGWCKj1sg21Zp3ovOqXxI0Ch7t34sHyhRs8t/ejAxb+pF0ACEov2kWqatM345Ber42ADQoanpFTA/sLpef9TM57kuaAZz9WWnQzoM/qakUbRzpTGHxfWRFhcNbToYr+r6pscpCyzy9TQklb9hTydLO9KiD4n9LGITDXf3MYH2VAjfEOwwQ/oQW4FIom5v7WM80cwhW4KTOLz5hT8G7yh++LncV5lw03u7rW/xXdoDlVaDp0FS/RQf2yrQ6yP/h8oOMGe3LkVCpV67mfSWUTYN6/OYQ9UM5IQ8URoYllwhj/erX1uP4fwcSTAfckHjtBjxzodMVAscO4rrwRGQlt8XCrLsvDhgkeg3L+ng/17rni+DDAIgat3NZoow2haiu/nFZjefBjGiW1ctASSYQBO7ByQoj0JINOlc6j+WgRvQEBap/clIpHoTSV+mOn/nYwgF684jOHNiRUXVjDiw5jTY0P3pEb3bIKxWwZRslnloE8w7ZOZf9kSQLu9y9Lty9wAna1s7pDBSdW5FCiS6bqI4yj/6pg/BhHYFMGrOF97tlqFEu2LWcSNCGa+KZQigKGYD+TCes5BsvEZyWb9PS3OZXMmp+pfYTgtdVrmE/yyew/DXrgJSEUvRjCh/C12PgQBfub8aq+AooXus6EtkevHg7Vw6Cj+mq4XKfiuhQcKJi4hJi8/Z9eHoxFD6wV8Op1kcW0x559EjBVwKUmeSEFABADT090edr7/a9JmkfPyT0i5g7VvFJIFoirrMkwHsebGjTyvsCqqgcIOrl4+YnxLj/VF7AEIKdFTLn9dwt53O1h7HYKxuRypSSBBBb7nLYFirXfxtZItkE9K+H+ufl1TkWSA6/eEJwGj4SC+hxillcvOwuSzgrvPDho5fLveTqTgdeG3PfuZ2CoVHQiKIIx7J8yfqVtBcZdsBTKOuEBopsuYAdyLKDyuS9+cW4XMVd6KsIZ7+Q++K529bT5MPdOXXA0ErYxPPv5O26u6v6cnKspSyk9vkRJ2EZVaCZ6XOIm9/2p/IzUNc9hIKULiT1QSZv0X+CUVKXOn3DzBilW+UJOdnQ+lGF85COzmdmEAdnvJ98z45zeiuVTk8VhSyUNW2F9vUTQ==,iv:dawoJiX4QSHcVWQ3ipe1WNKX6Wm4mMyKjOLwC1akPUA=,tag:nhD7pnLLD47Uk9yic+Q3lg==,type:str]
+        password: ENC[AES256_GCM,data:4rT5C0Qa4eAVk1NYvDJ6jFAcZtjUreaTMvn9,iv:l6q4bjqKxYQAxSVW+FOXvn9waLKa/a2s7exWtFJdDzw=,tag:tHXjc6HbSHnpS8oRWywg0A==,type:str]
+patterns:
+    home: ENC[AES256_GCM,data:A73fukEIu77xCOQGO4WfseWktTO6YUXOvahz+Xh5hs6MoQziW8zYLoMreCAQkspdFAYWBUkmTs5ntC0PC7W7KIcGqZoVvlUGFjElE12fn+MzCZ2uRuxNCy5Eh6TlPsZQWhsvwrc/hXev2FbxVolzDnXjvHUxoxP/MCpoieOEQ68HWKtb6w4mQ3Nes683yNzyJiIUXJvy26p4Fyhz5WI8Bxq6ORi2jpbNANk+SdNvZmJytd+Cuj8kKVapDmHmMhInktRD4IOOZLP48n4340XQWD7p1BLZWUAl6TwQCWtdx0cA4hjacaDQTh2VIxfSPs0PoxyN4wGAnFVYvuKT7z8iSFma6ygowiSt+3kGpeP5bh86I/oKfIGQUwjeTzpJAkTdRo0akHNoAel+/hkRt7jajuvuIRYTGADQWThdBBjOg7kIxMY0/ypGVEOSINzwlwv+Ohtn2PsG0BpLI7TANUdvd2VOLjROCHtKMO3nOeNQWtsAASL1+DZYPy1iSr6uGSr+kNWnL/pvtnQaTxiYZHbdY7wziaiJWxfRMGjIgDJCcZhJgGHCWceXHgVq7mG+5ThH0teqbN0QcuA4wwFADW8+HcyizX/NlK9qCdI2t8/yeD/ykvJ5M6228TNFraiWhDLkACW340SBkCN1/YSLllTDvS9LF7Unz63tlyKQNf30G9+m0zxsj8g5bqQGLHA8wxFsGcVHfiHmWFjqBTijZj7MrbyJU2z4G70bqvWEpRyWSnu0681LtnUOKw9MPDDvZMYKyVy6JqKDybmtd8EwlBRIz7VvMNbI5BNK5jFRvwAUNLSfJatuQOJ+MdDPzn9FKnyFPWgWQ09lGXe6+ZGg8jHKoK6qb2ZP7EpSUhsu8p6ypVAPRRwgoqPpz0xcFmzyJq4tPMG/CBA+MG8Wr2qr3kU90RtFuUrre2umWU1fwiCS2hsXnL9dWXNIBH1MnmV6nhF4S8eUN3VNVregEA2kb1n06jCSJeDJBuy0z1QeR3NPwR88uWRpp5v+/IgeVJ8HUDUBTOLqpbZxS2iKDgbGkOEz,iv:CtarvI1iN/t8qYoe6Wznr3aA+EFhivUep+UpAY+Mk4I=,tag:SqSbV6r1SLe47Zh7vP2ViA==,type:str]
+    etc: ENC[AES256_GCM,data:e+fAxfJQ7A6DcmejGndxZUHwzszZDZmH7nuqhpwoGgcgKdDmjqlroYgbJvWmQkiQWGxBdU5ZYdAb4392H7mk5StxeZfxl8CLFQAZ,iv:G4Zl4Y9abR39e8Tp3tHAeZ/RV0nXo27ETco+st+VqWc=,tag:hePvY0fhy17fxcWRohUiqw==,type:str]
+    keys: ENC[AES256_GCM,data:daVoQqMYwhyRZsZoTKcuhy19PQajLwebVbi8SnzsXPGZH2HNweLgUXuILevUw2Pi30Wc0cJkPlf9HlmN7MGk9iN/H3bO99GK8/ixDb1JmkQyIEg5FjCZ4OgfIw9TuAQyINnG6IMZVzjPPkqGdtjIssPp7BT03heQjgxP9gYUMqZ9jMk1UNesJ+MkSDkkrj9FZsO8aAnz7dOTCZpnaWGU/10UjEciegyl08rhCKgfRe9/RY3wCu8psxlqAcfkWEm4ZLy6/D5ph2jJhJ4uybrUyvtZ8t4joFYRvokQrUlMFsxVT2g=,iv:fF1ns69AO860KnX3MibQsV/fhzxeH8FHLEG8JNjLbW0=,tag:R1w/WiNtoLaPrsNws9C8RQ==,type:str]
+    remote-backup: ENC[AES256_GCM,data:Chpey91zFfH60fzcjOc1jKrC2j7XYWNezi109Na606ob6VkLncEw2lmD6EJJVXSn8Uru7lhKWaQZwS7JodEPutlut4ZKo2AVcYh6YAhJXPcktiX+zS/4MIpwfDZztW7q5YCdavhFpzraBNLHFbyZf7SpBOMO1MbGiPv/pSlX8a32jsBSY04DK+3m0CtYVjI/gamJHhTn1MnvYMPnCgytA0Uj9mPyh7u+1C94MWpmPAuxdib506TkwGGsdpBLV5396u7g7j3rULGYOlUnkGPW99b4dj3V6YoACI4Ej8GPCQWi4Zd5TNfWlkfrdokzPA0xGRJK9Tiw+dbJ3ww91PB3mN39TahGSQHRteUKrOBFRH2MC+BTnB/T5aOJTDfRWOkLHtcT6GHKh3/0ayjoE/lQWnlpM6FBFlnGunCxd7HYN/8dU5Xv/mMGBn8w8E5/wl48rpljeto4616aNlBQNVxt9mdop6aJebul60upbam1vgAX5kN9IBbfT+nLDhRNlO6KMUvkzOtQzKAVUiTbuida+X7z8YNi3uiXYma7ZBgp96+CZ8U4zGzMC/6FoMICDi523SgFGsTCUnZW2iclCOcO66jRb87SV+OnUy96JSvK0bQhESWOZ47FZo4jXqZ/fN8ykZeiqgTcV3t46LYOMFTmRyuFNoQp1sAXFhcfRtpU3O0bXPObZbj29hinbuDCMWbEmw8ebJh+AEet0dhIBNXYa3Kqy6XRUsa8nOAYgczprosrZTqPkNetmNpu/3MDl7GyrpMpPTWhsveSwrb3cGn6XxlvTckDezhvJjEzyT42t1uXjclty+UKFvjhmlW4mkrB3GhFB82o6CpG+vuWHpy8S9wOSW5GHCvIlAXDmK5lCqsViWtLNzATVZUZXkpGNFwogFjXsnZQj/lR4RQmMKfXJjxDkn80GsR3ohEp3VL+cgDcZ66rWAjaDUCXA44mWpEeJBXHdqdnhi3452a0A2Z5pHzRVfyb6clvmAnEeepUny3LtR5e0mCLagLoCo0wd9J590yFb+D6wBhvXs1dhialpburLxEbCZNntpq92l+s3vJ0m+vTJEcalkXStnevLFRkjNGdA0sWM3v6+diupDHbIKjTQ8xgJSJHThlk/0RsRZsh1s7Z0WaZaJOFVnrF6RAOxhc/l3t4grWyvUFevpSlEGSMzh/QmIaHWFDJBu6MkbIbnqOLzYer7NPRTlx8vozG0eavYyREU2P5JYZe6mI7lypigrSO0J1PieC9aUTLsdOQQgZBWQRLTa1eR+sSBfGfNuKlFXFMEtFck5axjdx86SRzj2aDILE3Vt7Ucky8kBHF+dWaFgIovKJLnXaL8kZKkGBUqMtDlTUmhffSrPrGJWJKnFbWeyPdIB+ikvClXlYOgJB/r+C3C2Uk9KoCe9n1EzKNpMRQVDc3wvUpiAY4Av6i8xJtcuF6FRWnMtSgSVRXF6EdlRAp6oP2LpyBydjcEpBTnkE4mFSqjVXL7TwCsUQPh+0VyCUoxrjWFIKnZggS+wilFGSRjLaIKQ/6Yac8av/anhnZbw23/a6vFSjWhLubsRJHqNF4wGfF4niKF18D+oEvHXzbcEHOsx6hY2fQt3/FwD1vzGlJvwcLiO5moIlPfbhGNA==,iv:Ymqla6KavektUSzm94/WZPeXTTuCzNHV+SSsaDrx2Bc=,tag:HMMOuEnP2DFEmMc5cDEIiQ==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -35,8 +35,8 @@ sops:
             QUlyNHBlNDV6eVJXc3VWNzJSaThIQUEKCdNxZCCNISWll5uaCcDQBA2ir7oLpHco
             +7ypF6lcOalqjvzc5DTXTt/v6QVs0f7SCZmNJFBMpZm8M2B+7O1h7A==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-01-11T04:39:58Z"
-    mac: ENC[AES256_GCM,data:QUg/3MW3a7vlunhj1sTCzY2L5vLjOY9ZhTSwVujHCrN3SMcQWgyOK+m5vbdjqNwezyLKmTg8av6nTAqHwSZIKyJZLfkxKFSIzizR0IJEkf4bYrCXeQ6z/M7EaTtMbfXOEk2eNpqFuPjpErJL4vHz0e5ZYtdKvLDLUK2XvWZRKXg=,iv:1x6fim8dxMAAfmCVN7UpjqudHUpxUE3YQQLABccnXA4=,tag:Se707Qcr6ON68ymdVbLXpg==,type:str]
+    lastmodified: "2023-01-12T04:49:13Z"
+    mac: ENC[AES256_GCM,data:7b+b5RHO59kJgC896pMpXip29zcYRG0AsD3MBw+XiKuYelLcUMbOTt9RfKh06NFzachJtuCDDsiK4y1nGQY2cP2K5rY0U+SmV1nLJh7/x7VbmViRajtJpZ+YhnB54oPf8D+O1K8ukMT/wJFOA5q1pm7TLcd3F6HmyvzClaF4GFI=,iv:FC2q+hEgou8DinMhJOQy1AYZZ1bKSGDrdybkQ5na7vU=,tag:Uq03nhaHHwUFAbQJrlQXwA==,type:str]
     pgp:
         - created_at: "2022-07-18T13:19:32Z"
           enc: |