finish gpg rotation

.sops.yaml

@@ -1,7 +1,6 @@
 keys:
   # The PGP keys in keys/
-  - &admin_alice F63832C3080D6E1AC77EECF80B4245FFE305BC82
+  - &admin_alice 5EFFB75F7C9B74EAA5C4637547940175096C1330
-  - &admin_alice2 5EFFB75F7C9B74EAA5C4637547940175096C1330
 
   # Generate AGE keys from SSH keys with:
   #   ssh-keygen -A
@@ -26,7 +25,6 @@ creation_rules:
     key_groups:
       - pgp:
           - *admin_alice
-          - *admin_alice2
         age:
           - *palatine-hill
           - *artemision
@@ -36,7 +34,6 @@ creation_rules:
     key_groups:
       - pgp: 
           - *admin_alice
-          - *admin_alice2
         age:
           - *palatine-hill
 
@@ -44,7 +41,6 @@ creation_rules:
     key_groups:
       - pgp:
           - *admin_alice
-          - *admin_alice2
         age:
           - *artemision
 

systems/artemision/secrets.yaml

@@ -21,45 +21,25 @@ sops:
         - recipient: age1jd2dcpykagz20kpk2kkchte3augqncwfn6nywursx0dkfyze6feqdzxkq2
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxQUlsRm44UFpPMmJFbnRU
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGZC9aczBZekVGMVRBYlFV
-            Vm9wNXFiRHpibzRXUGpPYmxrRGFlT0kwV2s4CnE2cEFQNmpmaENpMDB3TXA3WTBZ
+            MUpDZFFPRTIzL1hpR25vd2pjZzJnRE12TkhRCjdiV3VxVnJpL2l2OU1rNVE3K2kv
-            Z2Y5ZGROM3NhelV1THlXcWZtdWYxV28KLS0tIGxUV2NxOGx4SENvTUsxRVNkUkdq
+            akF1UFNtdDFYdUNIMjVwWitOUDJ1UUEKLS0tIFJkSGU1MC90ZlM0TXJOeWlWTnJT
-            NW83ZllxWHo1MnNHcGg3NG9lQzM0dncK6HtsXAg8vnELLSaFRz6X5TrWsuIkAfFA
+            RFVEMjg4bjd4SUF2SjVWZVNDWlpiR1EKmWM9G8/vb1+GX4zGiIj/So4apfi3wzyp
-            Sq8ld4/P4pmFE90MnRh04F4dVJ70QrHPV2zZzzHHHLK06pemwkGdlQ==
+            yGi0T3fen3jzfU38xFZ25Tn0pDTQaSG7PkVKQn9YBJ4pGb9JDPfTjw==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2024-08-21T00:27:31Z"
     mac: ENC[AES256_GCM,data:rST3ZwVMS/Us5pufse75X+j1Z2g6Kgb88luYTErBG79IvnoX//GdF7R3JPcQVp2o4rqFO7AU6zvh6PdGZjH3DS28k2iKe1qX1PKxMVihXnFFf8Zh/a/Uc0zvG7nDZ9FrLn4mv98LmKaqSjqsmgycpTY8HgRRaeAo4gXgtOwcF7U=,iv:6mQj3CMCk4yb02HW6y+VyvaHIOS4Dxt5P0krOtQ/pOE=,tag:SQHVH+ZbtdTUsmDRF8oMvA==,type:str]
     pgp:
-        - created_at: "2024-09-05T05:59:59Z"
+        - created_at: "2024-09-05T06:10:45Z"
           enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA/3GV3g+HEdPAQ/8CZSMluFpMY9uZEdbtwtWEIawSaTCJl55+0xNVwt0xPBH
+            hF4DQWNzDMjrP2ISAQdAVPGTjbrJcO6UTQ9bYOqiVqJMehxGkfNMtgnQQL36mQsw
-            v/JHTWPtsW5UCJ7+z7D0slT13vsEjewhhTUO9lGXNXGBfJQ8NP1oq1NHs6v22+PZ
+            CznpGVos/aNWRKmt0nkfjHuI0y71foFWt7BB/acKspE5YUu831wgrRbB8TyN69DK
-            Nbe7fWm3tJ44ic5mITBzj2+3lY3QtOcuXXfbU8X3ZaO0ZFwzUuUSSEaJRYuTixsZ
+            1GgBCQIQjanvxCPgcaSWLqw2oXXPzTJ1PRJc2UA4kayYIzvOUP9QBoEruDki0GVi
-            oUd2eXs56H4omDfkUkyzuuukVDshmWYnuKvpKAJGNCfARYH9bGlCPk26bC3BRWEx
+            5n+ZiGGtvx7bihZ1WeJiHcOArPr3xrrrPv6nuAxP05HbSRYhaAU79eOTT1p7MtSO
-            nKZDfoFmdmWtpxMzFvAmH9ODkLrowqGz0ZsAGR9B3OMVN9Iqr4ZFu8bA37Zkrrz6
+            A0BHgVYuL00FHg==
-            VsV1Ru1/dZR5Xcis3QWOAcPWJxJCL7KFS8NLb9VdDYx4UEBJ9ptPxyBORwIz2Ghv
+            =Luz2
-            LTr50DzUSyndVWcs4mW3uGrBmHqVnGZV5CxMPvzJFjLIJ5Ibw0nWfOlkTV5mBXtg
-            NHd+x6mvQmyj8adMUNyPckFG11xqqXUQ9Rtzv49CfNLBgs4U08u3iSi+qCR4zTpt
-            FFfAF9nplMheN2gbkv9G/CSlAMMabNqZmcKdGwTx7USeSmukc7Fum1SqLjL5wsIn
-            E6QMnDLdOLOO7MhCfD7osCTE7+UnGf9V/y6wu9tEUp17EYc0FqyK74UUxLjwXuBK
-            tIMhc4ZPXnLCyJ8SrdwmO+sPOQAqLx4oN9DrDlUMpHjI3ccQP8GsGK5CcRUba/jS
-            XgGlG6/ltgf9j9DnI5KnOwey1MiSaTLogJ389rQc0E6TVI0qpKPXvtwl2/oC6cfG
-            dIuJXfRRpteqjis1O7c+V3X/lE6SPQEHGWluGkoZXq4+mCieYMioAou5muXWwKQ=
-            =gXac
-            -----END PGP MESSAGE-----
-          fp: F63832C3080D6E1AC77EECF80B4245FFE305BC82
-        - created_at: "2024-09-05T05:59:59Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DQWNzDMjrP2ISAQdAyv391rYONuDgILtlxbFJRYNvN29bwY8mHm9VTNZGKj8w
-            tuKsAMrjUQ07V4+0vLlIqXjRJk2DPIHA43jY3asxDwZNYA9cstYwcYaBegStKp+O
-            1GgBCQIQtl/y2CJX+hYNQWo8b+r3T2bUbibkGDYhTAzexT23mwmR1cknYvEaCRw0
-            n0FPL/N9WJt09T0Xf1PrA3wwqzZTGSwK4UxhselmeubOPcO/fmeddws9X6f6mFXT
-            c4lKZbQpwKafsA==
-            =uYBb
             -----END PGP MESSAGE-----
           fp: 5EFFB75F7C9B74EAA5C4637547940175096C1330
     unencrypted_suffix: _unencrypted

systems/palatine-hill/secrets.yaml

@@ -31,45 +31,25 @@ sops:
         - recipient: age1qw5k8h72k3fjg5gmlxx8q8gwlc2k6n6u08d8hdzpm2pk9r0fnfxsmw33nh
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUZmNheDRnVW1US3NycDF0
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzcTQ4SVM3dVN4UWZCSXBs
-            Uy9XckMxNVZtRXl6R1BHVitqenp4Z0xXN1JvCmJkV2dhWlliL2lsUVQzUVl6Qzdk
+            dFo1S0ZyOEM3c3ZtYTcvZlVNYStDdXd0NjB3CjY0NWc4UkVGUk1ZdTBBLyt2L0lX
-            VzkvS1ZXZHp1Q3hVeDBpU1Fta29pRXMKLS0tIGJGc1l6TzZjTkNzNWd2Q0RwQi92
+            M0lRbXFwRzFWSTNndC92SU5kSkowb28KLS0tIFhjMnJzZHRoTmJONDk1RjVsRVZq
-            TnpjY2wzMHppMm92VVIrbFRkMTVVQ0kK8U+4g91R5N9Kb2DaJ7Jo3GQUA9rbJOa1
+            d241ZnZ2MWg3YVNBbkh2S0NqeE5PdFEKWqnQH4kZszkKZTSgur0c5hGMoMx9zBdz
-            wZM9//l/el5DxkNf0Tya/6tLzutDWigIB8nUpuesu20QLa8PrqchEQ==
+            tSvUbe2+WKX7q6y7XqsD1KjFI+POVDF+YN7H9ja96+JqvKRteXNhCg==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2024-08-18T00:53:19Z"
     mac: ENC[AES256_GCM,data:IxvUHA5Rx/icbar+7H4ii0M2llOaMD7c3Nx57hR74FhDVgXj8/eCX/yJW3K8+w9ZGYasFmuJZrvd9Zan7kcPeiSMVJJUJNNyoURkBZeF2xPcVq56GYGrzzFsUIfzhrjz4PI5nEX/X1ODs+8KeIDb8pNPILoJXHhHWHSXavWvx/c=,iv:v4U+AeUDsBxKyrbu8sEmTy+RAAJvITK1IMY7mziRwtU=,tag:BWedhwz4hNXsou5FO53XMA==,type:str]
     pgp:
-        - created_at: "2024-09-05T06:00:04Z"
+        - created_at: "2024-09-05T06:10:49Z"
           enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA/3GV3g+HEdPAQ//b+qxOzgdK1y9nBwNVCSmfqHGFG9xckevXoSRaKqDgJvq
+            hF4DQWNzDMjrP2ISAQdAA1DGmMjNYHKHtel++ftsHqmQGqrjfL4VJTe62bEMfXcw
-            fBCUZDoJZA1A+PlGe5ufHHF7s+r7ou1cxft789OJ2wSEu1HlN57y2WQvErrGstPa
+            EQmF0itX7ns+GogeYeYaqxa0qraWzzGwsEDJOp+VJMmLPtw5999kdO1PikgyGkcV
-            IZ4MS4UFc9Ic0ImpqRKPoUBpfCPujJel//Sg61IGL+bL7L2Get/U03mJ6Y79zIRf
+            1GgBCQIQd5DwJiXbQ7bFPYPGg8xxEBeDsHYtKo0tv9uQi9Is0nYYHbI8+TuFUv2o
-            mz+wdzCApDDtHL80KOjL1bjPDBxrvgTw9FxGirYDyM5wykrAaCSd99g7TkK7AdwE
+            Av5c+/hAX/1D4F8JDTnz7WbEO3X2H7VXNMQKQkYR1Ndds6ueyx1V4kFqQTD5qLG/
-            XO92JKHFRs9w567Skuw9JOkLnnMVQlw+gr8eDehZgozqMIV4/EC/LiDU5WYfewUy
+            BpnwAmW4i9XVMg==
-            hru10OI4LzztjuO9bT69BwIM8OVqkEdoxCWpKqosVdmFV9VXSrUJqbGL1SlXMxN7
+            =2NK4
-            10SDNtsoVrsP9t8+L1eYrMNOMtgo4fykq4JNaVKQF9haR4Fiw0+B85eV6CrF+lhF
-            BmLZay4S1C/66TIA5O1WQa+kN68Fhz7UgtnRnMAN1bA/aQ6exYzPvlDebxjSRgSt
-            DzDEfJlOgjha9l5VhYK+gdRSm9VJ5tzm59KVNow9gmw4Kq4OL5CQ9HzeIYm0ER4X
-            pahmWBIGcl8lSEcCp+TWIUPwpB1spe62nzQQ214qk3mjXSzi6KccuMORuXDo0ATw
-            SltCrem2o3T/UgCXUKcvvKkF3DQhudSywtPcsRtRMTyppBTSSLKNkEa+FBAoAw7S
-            XgG2EVqItArHLClrzVOu/ZFZnsB+zwNwIxUWUxwehhbwEM2kGAGDRqz+9/riIs5B
-            DTN99fw0f9ruiD6tdQWDz/IkGmYcei3DU6Q5k6Pn56Q1Jyj2ktvP1sxQuwmsW94=
-            =+NhU
-            -----END PGP MESSAGE-----
-          fp: F63832C3080D6E1AC77EECF80B4245FFE305BC82
-        - created_at: "2024-09-05T06:00:04Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DQWNzDMjrP2ISAQdAp8XOoP9nVWm6O8Z2BoN6GAo+H2oEG/j/EOUvtRtCegEw
-            FOpcpcPbr5nN0oS/WSzWsC/ZdOA7FHUgshYz1zDT99kXRX/Te8jCKuTagKjASq80
-            1GgBCQIQykxkYHaJcp2+489tiyGuzEDLpOLsvCi6QJLhlF2JCepYiNDDfMQkFKHD
-            se35qeCTR1+22Sv7FU7vqu5Z2iN3+qMYcoB0wyI6Ij7TbYPZ9ix62Caf18V4FxHb
-            DHHQvNiwaQ2/tA==
-            =HD//
             -----END PGP MESSAGE-----
           fp: 5EFFB75F7C9B74EAA5C4637547940175096C1330
     unencrypted_suffix: _unencrypted

users/alice/secrets.yaml

@@ -13,63 +13,43 @@ sops:
         - recipient: age1qw5k8h72k3fjg5gmlxx8q8gwlc2k6n6u08d8hdzpm2pk9r0fnfxsmw33nh
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlYkNuSWZLbTV6OHVHYUtX
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4MktuVFpreWpSQ3htUjRa
-            dm5MY0J4eEhYbktkZVVrSVd6L0l2VjZzMVc4ClRNUFJocGU2K2poNzg3MlIvcndL
+            akM2WTZQL0F5QWNhVkUxVVA1ampWcktyTkdBCjdoZEo5Y3ZmT0lseENZQ2doL3lW
-            VzVPUk13U2xIQ0phemFBQkhtWlpOdE0KLS0tIElpeHYrTFpRSlcwQWZXUXA5ZVZ4
+            UlFzcDRMSUxsVWF2OUpPdk5keG5oM0UKLS0tIGZOODA4RE9oZ2dnQ1JOK3NrckFY
-            S3lvb0VUTXo5OGN3Y3dyM0lRZ1NGaDgKBSf4zJsD7eF9/nzikvB0VLY2A1NXPs7i
+            UFRHcXVwNE5Qd21QU2loWWsyREU2YUUK+W9PpahNvMMvm5ODP/2zSq9OLlUSaZwL
-            X9/wslywHCOFMMqExsllhW/BBQQIAYdh4O2ZdOrjfwB0BZFsJzL9Wg==
+            DF3VrtlWLvT0q+YPCBt1rIGrVRx9T8BgMfjqw1cU5H42JTMqgnFf4Q==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1jd2dcpykagz20kpk2kkchte3augqncwfn6nywursx0dkfyze6feqdzxkq2
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0TWwraVZyRDFKVG1sUWdE
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1RWtXK2xkczZoRGhuOHFv
-            WTlxaHBidmErd1RUNUVsUUx6YXUzQWlPMkVRCjdTNDlocENzcHFoUjBpZjJiTmFT
+            RzhveW5mZVNGUjhkb3M2YkYvc0FzemZJa0VFCjVvRnJBZEQ5dTNOeGhUY3RwQmVF
-            bnFNOTFneDMvbmx0MDFwRGdtdGM3Z2MKLS0tIGlqQysxQ3RjTys1R0hmbVJpenln
+            UHk2SGpJbUk3SC92TFpMcGVEUFdNdlEKLS0tIDdKTWpSQllDWXJmQTRTNkJwNUN6
-            ZVVKR2NuSDZKUHA4N2MvclhKMEJ6dHcK3sEMicz/rhfyRshxpGx+e5ReEw+lD/7c
+            TDVKMWd2T3EyR2FRbWdkN0IxZU1aUDgKAr/wWRwHL4ozrjwe2WxSsDWMcjoRvOxb
-            nRNunhIZtf+pTBPG7ElD3FOuStCv6DTFXhztqu3Aja+w628bLx37xg==
+            Dak2g6hcDa5CdHFXNen7BP7v+AX15JMWhAFkpnbJD6ZzWdsWG01GOA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1t29a6z6cfy8m3cnc8uva0ey833vhcppue8psyumts7mtyf0zufcqvfshuc
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjU3JaZHJvUHM0b05VdE1E
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByUk5JUEN5cGFvQXlSbWlM
-            dHFQU1ZHOWNlSWpsVEMySjMzaWNGVFpUVjJnCklwM3lRYVhKdjJ0L0FMcXZnVXNw
+            UW55c0ZXWGUrYzlkOG5vTExDbWxkcVp0emdrCnV4VW56YTFDa21YYkdsblRhODNH
-            SFoxRFhUeGhEVnZOTllLb2ZxekRWVTgKLS0tIDJSN3FucklieUMrS3NBQUdPMWU4
+            NU5TS2Q5K0lQc1dIT2U1RUdBVjM0WDQKLS0tIFRSUld1NnRvSzRQUGdoRUdyRDhh
-            YnJRczE0RHpBM0RpbjdkM3BmUTdzT2cKIffP7kl+tuUWdM5Jqw9bacVZhniD9bCj
+            ZERFTlFyNjhOb3VCaW43ZXFHT1Vxc0UK7YV+BU7dCEOZxpqkQA394eDsnthvorj6
-            kF9/HblNay401P265LnBStbXxcTFJFdFGej7nvRr0dUo5sRJLVX/3A==
+            7bqrCdeU+6DU7DmFs6++BrNO2tx8vvOa1im+ZGrM/gZAJdv/7R2d6Q==
             -----END AGE ENCRYPTED FILE-----
     lastmodified: "2024-08-20T23:15:03Z"
     mac: ENC[AES256_GCM,data:VnLd4N2l7JTKA7f4eh9EKilW2f8mmEmLc06WbHASOn6N+MIGPHwyLjLbPVECuXiVl95cs0+uWsFOPEbLiS6XTB/gZE1OZMYqk0x7FVkQNxMdWwcVAQnncC6i/cdBTAx+GW1iF6Cf2eLY1wNNiASk/Bz8u3r4UJ4QFXuMovPsfxw=,iv:Cr1bAYrwlK+ClRFDsiUdEIqXDU7onubthDEQDlTM3S4=,tag:EyfcNB0xKrFRjbp517akpg==,type:str]
     pgp:
-        - created_at: "2024-09-05T05:59:35Z"
+        - created_at: "2024-09-05T06:10:22Z"
           enc: |-
             -----BEGIN PGP MESSAGE-----
 
-            hQIMA/3GV3g+HEdPAQ/+KWdXOEd1sfP9+/0Yhc1PFzdjr2yYTK2tEcCAMmri0BMD
+            hF4DQWNzDMjrP2ISAQdAsKZuBCB8RlxBmAlEjm9E+SClVYtlKlGEwxpp/rXZJhMw
-            nMI8OTXgu7b+viZpWAyZAfC7/1h2CHOmOUIwlEartB23AlyqjwUOsDYkXSG9MZkI
+            yUKONA7CFw9RIfhyOCEQIMUK1v4zOofJ+KwDDOCySg7inWQwt9MRmNzT/eSvBpzk
-            3W87fn29I5igY6wsGbatkzG5S1OsBoQr66hP7w/1Rua17UXmWFOR55RfDwqpK6Qd
+            1GgBCQIQzP1qxZbFdqNpVLuW6f6MplUSIRrtIXk55oExkldT2QEaltetRbTf7mwc
-            e/L93sbOL9cPak/EFNIP0pJJR/eQUqfYRZVzQKE/XrWKpJWfQK1iNae3n9ne0w09
+            KO4l5rUhQBYrGrFWs+HSNJKU3039lYfoTmDyvBYsirYyG7WpPKSlVHjW2Tg93itY
-            ECwm+tf9iLzrvEC6hAE2FoG8gRvqFsNxVELzP9o0XQnr+zKuDJu/vN6sqeGgkJ8Q
+            qeyGv1rFUVAanQ==
-            GQ/lhJMtT2Sef5dzuNPSSOk035k4o9HfCPCr/5pFM/nuW+Uy9jQkUboxepvVf91h
+            =PM4s
-            rx5N3bXo2hzdhFIp9HGNQ25HlJG6eF3R10BPP9/wKtRtgQZY+zTbgBdMHvZB/qr1
-            m3ou9wasKkpjkC+z/dXM8lShe/J6F3uXMpbofKVcr+IroX2/I8RHUZXKTSk0o8w3
-            hZZtcadkp5j5XAV8AnUjFq68ZXVz56lzFF039WSGf9sBCWIhseTmUCjSv+QO9Zcd
-            B7iAr6+lEuglgM8aME19wPxQu3dj9eRWNWdlwpMjVEnucPvOcIidnXvvRah+lupy
-            dr6SlTd2dQDK7T15u/VE7Hx0Fo6kA1nsIiQ9A3u1gTY8LPzzWbKQYlrjfMXRKT/S
-            XgHlnhsvUP2PFHozwmg0AmIL6E+D0tRau/cjPUC1z5iOlwZGLlClcFkgtVozjXs7
-            L7VnkjlmgBUfYZLdL1Lf9p79Fc3iP4zizLGr34Aw/6JsbefDALsrTGEEhTNvQuA=
-            =x21j
-            -----END PGP MESSAGE-----
-          fp: F63832C3080D6E1AC77EECF80B4245FFE305BC82
-        - created_at: "2024-09-05T05:59:35Z"
-          enc: |-
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DQWNzDMjrP2ISAQdAJGw2HnSZ7MQ8gBHzGkIEr5oVsJIIq83l2ZD98/r3uxIw
-            fFb07OKAwOcLy6YJlQNjKktMQxdwW3hyGxuAPyfT9cdXt9sed3KLzgAZy/vf4ksm
-            1GgBCQIQCi8U25A1PgCh1bEWhg5S6nBEtck5bi6migHxINyTICWt38VZ/xOmbNgs
-            tCdIsCYGbYM4IOvtm+avMawa6ExCaCBoXAeJrf9k00ja/g0ToxrxtdPrNsr928P/
-            ECydB5vtljkxIg==
-            =Alcd
             -----END PGP MESSAGE-----
           fp: 5EFFB75F7C9B74EAA5C4637547940175096C1330
     unencrypted_suffix: _unencrypted