From 97197a03a74fd4da8489ee8e5200d4294e7a29fb Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Mon, 24 Jul 2023 17:44:15 +0800
Subject: [PATCH] secrets: replace foodogsquared's GPG key

For now, the old GPG key is referred to its own key before entirely
removing it.
---
 .sops.yaml                      |  3 ++-
 secrets/backup-archive.yaml     | 46 +++++++++++++++++++--------------
 secrets/multimedia-archive.yaml | 46 +++++++++++++++++++--------------
 3 files changed, 56 insertions(+), 39 deletions(-)

diff --git a/.sops.yaml b/.sops.yaml
index 53206a0e..a1ecbc51 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,5 +1,6 @@
 keys:
-  - &foo-dogsquared 8FCE86932583783E515B6FE55F2B001E20ED3763
+  - &foo-dogsquared DDD7D0BD602E564BAA04FC3514310D9141152B92
+  - &foo-dogsquared-old 8FCE86932583783E515B6FE55F2B001E20ED3763
   - &foo-dogsquared-age age1say65zc678yc03tx4zexp20c9gvskvwrm4390j4x2jkepn97duhq9ptuj9
   - &ni age1dm9xugju4q5gx0zty8ckw655ea904c64gv9qw9fn3lu507ck8uzsag59y8
   - &plover age1sj497yr895335rk77qqnrqyx9f7462ma3lz0a0x3w5cnla5uqgpspgggtz
diff --git a/secrets/backup-archive.yaml b/secrets/backup-archive.yaml
index 7b01e31f..9303b950 100644
--- a/secrets/backup-archive.yaml
+++ b/secrets/backup-archive.yaml
@@ -20,35 +20,43 @@ sops:
         - recipient: age1say65zc678yc03tx4zexp20c9gvskvwrm4390j4x2jkepn97duhq9ptuj9
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBub2xqNVJHeHFNbzRsQzlJ
-            cFBZTnBTWVdRbGtKZzc3b2hOVEIxbFV5RENnCk9BSTdyRFI3eHBjZ202MFppVHVW
-            N1V1QllWcTVVSDZZTFRzcUVSL0R4VU0KLS0tIGJBQkdUaGZTM1p2NTQvSFNWa1R6
-            aHF5WEpjcUdBUWtaYk56RWZyRWZvdFkKDJg0l69Aa27SrWcAth4CbxdOACDLqE6t
-            crS49bDKqhZfsxE/6TNt279uBvPR8SsD0IE0hlBYJqGz6CxTmbMX8A==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkV2t1ZW5LUTdDQ0hXdHpm
+            bmdvN3A5bW03M09Oazl5Ums4cWl4NXljNGpnClFzZW4xZU43Q1N2bmlDcnZVVnE3
+            Z1BuT3E3Ym9vM1ZaTi93OTdtZDN6TWMKLS0tIGwzS3pjTDV6cHo5MHV6bVB0Rys3
+            ZEExUHNtSXhMMzVReTNhKytFZXRzdDAKgz1CrhcLZ9pN/+6mafqXlpW0l5urC69Z
+            JqQzi0Td9wFwdwrnP7vWLwCz3HWHNIwoI1XzR0IjI2vwp33G851crQ==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1dm9xugju4q5gx0zty8ckw655ea904c64gv9qw9fn3lu507ck8uzsag59y8
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkMTlpWDd4ckNKRWpNVXNq
-            a0FSdWhVWitCUEFDNjVNbDdHSWlWYkdxbHhRCkJKT3VrMDVhNEh5T09JYUR0UTYz
-            bE9DSW56UXRlN1QrSVZtMHhNQWVTekUKLS0tIEw0L3dnSnFGdnF3MTJpbmdaMVlS
-            QUlyNHBlNDV6eVJXc3VWNzJSaThIQUEKCdNxZCCNISWll5uaCcDQBA2ir7oLpHco
-            +7ypF6lcOalqjvzc5DTXTt/v6QVs0f7SCZmNJFBMpZm8M2B+7O1h7A==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0QXplbjgzV3dGc2ZVMUIw
+            bGM4MU1CMVdxZDNpSEN6OUFYaDdIMWFaTFF3CmcvbW0wUHJVQ0NoMzQ1QnpBVjJz
+            QnBxbFJONytVN1o1SXMxUll3cHM4WmMKLS0tIHBYUTZXSjA1eFdWRXQwN3RsVXhO
+            cEVPdFlaR0hWNFRTMUtmdklBS2p3L1UKTk0DGtspX/MEky7GdmsG3EPw5bavxttJ
+            BF0k94Nt9nCU3PuoSeOEuBkubP90pdZPgqgIdG+6YAac7FHGktBM3w==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2023-06-08T10:49:53Z"
     mac: ENC[AES256_GCM,data:ffkkhQagMqYbGKModSmUPNN9LZCcpNpe2mFOOxTUTdk3ghqM3IjEt5TuVvFa7DeYmWxV4wuBhTZ+bnWxm3LodHP1pUsiu4G21Zx2ht2Ru3kxRZdPTwcAoSosTKdQmSB2gxCAfunvfzA4b3cRLXdo1EAQ6v5qWyDj1ZD92cX7J+o=,iv:jWRKSN+Uyate8c/SYOLpt5RP8CeWIh+KJS43dzl+cAI=,tag:E8kSxM9fIb/NKWWcpA1ghg==,type:str]
     pgp:
-        - created_at: "2022-07-18T13:19:32Z"
-          enc: |
+        - created_at: "2023-07-24T09:38:08Z"
+          enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            hF4DFV150TdUJTsSAQdANGcWrpkQLvVjB4XVycennMACAEher2mlKNsUFFGSKhIw
-            6UHOKEdnTaWaOWzq1OhgTSqgYaXoWu3dXmZ/LAN7skym1jAiWFJmuqsRiDDsyH0V
-            1GgBCQIQ2xEU2UgjyW6C9p6MUOniPypezbI+fd3jmJ3iIf/93a8M0+0vowWyKgGE
-            wdRzSlo4bCz9rm0BeS1Gxw8/5rkdmkHiGpwfk9jNUJ6pkQ/oRdtMCrpNAUoBdgge
-            S4DRtOSDgQcepA==
-            =qoxa
+            wcFMA0MCE9LFsRfKARAAvb3OPctJrPgcR3VrcSuXgi6nZrueJgg623/NNYn1h8uD
+            Z3GJHFflBN2QawIyE2HCNcuK0r5fLMpAYVO74VqUp63IAF/raX+KjbJLs+yxlHv1
+            E7ZyfA27FUoHvv3sV5jgytOWOA1kBT4E0ZkY92jSMMfPFT89ufQgObGwZ78u6UiQ
+            pnSfXfQIgVsI5gpFfxCOTooj4rFZhsJfi/FLTLyDySmt8qd/ZeyPpRLuWZT3IAwD
+            Tg23npE+YuitTQwYSN01fW3sknCu350fvzm9I8EflWM5PyeBDeIRUKsXvrS0yKi4
+            tYksj0W9g95VZDbt07XJilyx9iohu/X92AYFtGys7HcfOIc68tzWaYcniFd1Z4fk
+            amGIBUkXEeGALm/TTXd3tMOpm9Pz1vn0AJZqyAjcNDKAxLvGVEgHu0Ka2bm82aYm
+            z7N175Ojz1Nr25SrPTq5QAY9Np+J81SoLkIA0apRTa3RQ1fefnfHIWRfhAi0nCsA
+            rU67hPPm1T+F5Gho8LE4pKrCUGweWRtYMWyi6nrBZ+b4w305kND2h+/Y8vLy6jZH
+            QkMOoc3aX0Vm6EfFQSqxOl5vDQTRvg0YpDMf3irsI0xF4HNCxI17YlO+mmgF5t0N
+            CBMmg8zBaPkaf8py27iPO6Gd7/vGriuzyZdPYIip51qIRafsS+VYy//3grKGnRTS
+            UQEa/W/KFPG6JldqbD6vrPbSJWcsvXr7Wa+ksGHen4w9mkTJpyyo9wnp07cf/fum
+            QEoh+CTQvjnSJkR+v1gqhFI2alvWfijM5EKjkHvPoGfHUA==
+            =4y3h
             -----END PGP MESSAGE-----
-          fp: 8FCE86932583783E515B6FE55F2B001E20ED3763
+          fp: DDD7D0BD602E564BAA04FC3514310D9141152B92
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/secrets/multimedia-archive.yaml b/secrets/multimedia-archive.yaml
index 93023c16..fa67837a 100644
--- a/secrets/multimedia-archive.yaml
+++ b/secrets/multimedia-archive.yaml
@@ -8,35 +8,43 @@ sops:
         - recipient: age1say65zc678yc03tx4zexp20c9gvskvwrm4390j4x2jkepn97duhq9ptuj9
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0QlhCVFBzc25aVkJXWGdu
-            K1c1c2ZUQW5yTzNXN08wMHNBcGM4bEQ3YlhBCnUwOUpLZnR5V2h3YUl5SlNtVHhh
-            SmFuaVNDRURkd2xQYTBEemljNXdaZVEKLS0tIHBBMmEwR2gzaEViRmZlaXBNQkZi
-            TGlkQ3hBQmFscU9ZTnFQVjBZN0JEeEUKZ+KJl9JRhMMmxXyW6OhCRceaiMqMP+0y
-            oenqVW9r3yCaCw2kJSbzV2BbUar7fLYEeKDsOx+8Fe0KZFsiY2neFA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2eEp3K0hwZVBKQU53NVBn
+            Um1wdjY4Szg1ZXFiTDlhSEFZdXVIN1dUbXhzCkpCZzNmM3hWSlpCRkNIR2E1VHpU
+            MnR6ai9LRnp2dHllaVN5WTR5RFdNL1UKLS0tICs1dVNLeXd3bzQrNnBwam12UklU
+            WVIvUFM3OGNsck9tWmdtSHVTbGtoejAKGBNO/e93l3e/SjMm1rB9WvKSR33WqGNx
+            K3Ry4eN7rHUCZ+ATAkGm+vLk5MZNFMCIlaN0fhm9Q/PYFLRdVJwZqw==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1dm9xugju4q5gx0zty8ckw655ea904c64gv9qw9fn3lu507ck8uzsag59y8
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBST3Fla3EwTE8vVmlmbVlY
-            K2NaWDQ0WjAwZjhyQ1gwaVg0Q1dQU0JpN3dnCmxVcHRlTng0Ynp3eEJvb2JxQ1Fx
-            TXFQVVBOdnJQRHVNbWZYMjcza2lWTnMKLS0tIDZxaElMaFFCUWRGZzBnNmgxdFBz
-            MThjTXJzYU1MMDhCQ2hKdlN5ZTE3bm8KP9Su9bTmFkOwFa5EdYTh9jOUjmNESgza
-            Ngr+vPML9S1ssMNmR596y0qkbdYdJlOWx8sURbHaWxZvk4u3/m6+qw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaQzV6d0FVUVIwTlZFL1oz
+            VWcrYXkyWTdFNDhZYXZrYVl3Z3RqdXJzdlY0CjNpWDNhK2ZhSXJZWkFIUk0vVUhV
+            dVQyaXE0MGlkK2tDVUF5dnMwTkJKcW8KLS0tIEprbEM3dnBXSnpwaGJ6WEJqZDBG
+            SzNaellGdFlGU1YxeEhMcS9JbzZuR1EKRCnDF4qGnXq1fNxeJMn1ptsIRnL4eYay
+            vqo7thO8tQh302FS+2u5N2JFF6a5Fcx9Psh2BO6ZiP5EC+vnSEjwDg==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2022-07-20T08:16:17Z"
     mac: ENC[AES256_GCM,data:KOCuxHeg4VEcuzF5SWVRx5ahWAvFb+eGOyTvv5sNgA9JE7ectven0REXMM+2Qytn9+UmVVFRH4SSV89YB0BI2x2+GL+hLuLYIRCJ1/s4p9B+LIRfz6rqeo/w0ETHT+b2JjRhC99igHwksD+bLnHQo9XFcNvT2gDxvOaX+mSurSQ=,iv:+zrR7lSHLEhgtNR3/IMSnzBFoE59NJ/CzuoVz/KdauI=,tag:H59qLT3SLo4yYrzJexTryA==,type:str]
     pgp:
-        - created_at: "2022-07-20T05:01:15Z"
-          enc: |
+        - created_at: "2023-07-24T09:42:41Z"
+          enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            hF4DFV150TdUJTsSAQdAR0ATG8vfRp7urdbmLo0OW3OpzqIoCnjO0WMMSDa7O00w
-            H54xE+m7rEPmblCrpcDks4G957R6Pk53cPzY8NtiNg1TNPCFf75s2jx6Mqr1RWtZ
-            1GYBCQIQupykx2Am0Vi4VKbmzx9ZELAH8IGyunxqr8xpYf3bGhfbDPfgKrFoO4U9
-            tKRio96L5UJx2qoY8vtIHB9PrbRoALNJaytmiDGj48rf1MUNubayDWbjPh9FISjB
-            Jpy89DizGzo=
-            =xcTu
+            wcFMA0MCE9LFsRfKARAAsSyRa9I+HCvau+yt8Xf/4IBAK9d+62bdtXY7yWicdTFJ
+            zXEr8NetgB0j0++k0JmAJ4nkmVHHr1aEw0J5uM/c7QrVpduytHvo1pubwZzgtLt9
+            EdZjqw0ga4GrkUFD//Y5Fo/V5gR5zl0cfHkjZ6LDA0YCpGBZsd1hQ2q/mnihXyjN
+            HZ3MK/Y5ljj1/QidPp0YxIpn0x52TW7rKgv2N6ZoAuSZC/BPrSf3n3fxDPcS8gqk
+            qzQrZIJaRNptpkDPQbsA7HchWACx4iWw3klge0kHMqCALhSFipdhNhDcmRMCAIHY
+            ghe/8kLNK03KGBgajenwm8F2/Gui/mZcTojEecSZkS7GhMi2POT+yujuwy0mYh0x
+            5Mf08gkppXnpXWgOTLb9iYpnV299eY1ZvPCXNAMan9SKNQfbQbgskYi3sRyX8t43
+            EKZ4M5TfyrScFPI4eIOJvTRTUSJ79fvhPTgb85hg1yI4Efbw9H/UXJ/AlVT2Lh4b
+            9wA5E4hVhWYdYfnqodn0m7LHSeqdKd5YjphALQsp94/qYsgNGYsgUj0CN5Auo+Hv
+            s1dGjHpg9M0EsOB8IgJcweZ6jX7XtW38N7Bj4TrviLiaKOcZEm7TNiWai6IDdScJ
+            EMD3rVDvAdOQtCUWc3MzGBLewqZ2vYgyZP8mF40YCByedCe/OW48SoQWDHt9n2jS
+            UQFOjGhRW+VjUHs7OgAep3wF/VteY7iaGBRA5TvfkYCTJ4mWK1hNbe5Ku8zckK6Z
+            FPYedSenABf3R0bB7Vc4vMJrqXNmG535tARbtKtPtK9yYA==
+            =rB30
             -----END PGP MESSAGE-----
-          fp: 8FCE86932583783E515B6FE55F2B001E20ED3763
+          fp: DDD7D0BD602E564BAA04FC3514310D9141152B92
     unencrypted_suffix: _unencrypted
     version: 3.7.3