Encrypt secrets with age instead of gpg

2022-09-21 18:35:36 +02:00 · 2022-09-21 18:35:36 +02:00 · e9a3b15ce4
commit e9a3b15ce4
parent 8952434a63
6 changed files with 95 additions and 188 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@ -1,27 +1,30 @@
 keys:
  - &erwin b785a9688947edabb9ec8933ee7adefe1d943c7b
+  - &erwin_age age1h7ddyj66gcqt5vnzphjfn6y5tul79q0glcdl0et9w44z2evl999qe02wht
  - &loki a6e31f5ab2bf34ca3f614d81ed9d6ae54dbcb9f7
+  - &loki_age age1m93jeyexus2uqvrk99r7hh0xp7qxk55tgmju4h422dfkf92jce2sxpntu5
  - &drone 8eefb1f8c85704ca47aa226a692372b1fc4bb9bf
+  - &drone_age age1q0dfxz58vt4zxwx2etqy8xycf4l0p5nujpznh53kd0fwwc28ms7q6qrhct
  - &gitea ca0dba2f767679957879077fb8922c8ba16710be
+  - &gitea_age age1jkj6xrhr3uf52hac4wlda4a8jcegha86jf5lgv58df0xunadz53qpjlpae
  - &vpn 554dd0be7ba432b2a2c72df52b35c2235938f603
 creation_rules:
  - path_regex: machines/loki/[^/]+\.yaml$
    key_groups:
-      - pgp:
-          - *erwin
-          - *loki
+      - age:
+          - *erwin_age
+          - *loki_age
  - path_regex: machines/drone/[^/]+\.yaml$
    key_groups:
-      - pgp:
-          - *erwin
-          - *drone
+      - age:
+          - *erwin_age
+          - *drone_age
  - path_regex: machines/gitea/[^/]+\.yaml$
    key_groups:
-      - pgp:
-          - *erwin
-          - *gitea
+      - age:
+          - *erwin_age
+          - *gitea_age
  - path_regex: machines/vpn/[^/]+\.yaml$
    key_groups:
-      - pgp:
-          - *erwin
-          - *vpn
+      - age:
+          - *erwin_age
--- a/flake.nix
+++ b/flake.nix
@ -196,6 +196,7 @@
                  pkgs.sops
                  ssh-to-pgp
                  ssh-to-age
+                  age
                  nodejs-18_x
                  nodePackages.typescript-language-server
                  nodePackages.yaml-language-server
--- a/machines/drone/secrets.yaml
+++ b/machines/drone/secrets.yaml
@ -5,49 +5,27 @@ sops:
    gcp_kms: []
    azure_kv: []
    hc_vault: []
-    age: []
+    age:
+        - recipient: age1h7ddyj66gcqt5vnzphjfn6y5tul79q0glcdl0et9w44z2evl999qe02wht
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2MWVJaS93VjR6NjRjOEY2
+            ZjdJZVordnRsekt0VW5ZZlBrOXdzQ1hjMENzClBxRHBxR0xGSGNGc0dOb01qTDV4
+            TXlnN1FvbmdoSWNza0UwVEZIWGkzVm8KLS0tIDdESmJHN2o1eUtuU2lmU1JVSmt4
+            bkc2SzNsL2ZTMm40L2dzem9ud2JLeTAKCK7t0nI6blo9xtvrKehMdua3xweokW0z
+            HdiTOyOeZC1htmOTb+yXC1ge1CJ4raGhbqrMWn8ICDobcmog04TOcQ==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1q0dfxz58vt4zxwx2etqy8xycf4l0p5nujpznh53kd0fwwc28ms7q6qrhct
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYZDFJKzRRb25aL1p5R2lt
+            Y0tSTEgzNDJCdXpId0xwQkZienRJOTlHOFRRCkxQa0NwK1hWMDc3c3U2ZTdKeEtw
+            aVFOVEVaYU9HQUorNFNTZDk5aEJwRGcKLS0tIFJxYnZ0bE5HbGlicVlWQURKMWd2
+            WnZlazVBVTNBRWVicjZQbUFSckRwTWcKlft7yS2DYRyBM9ynN0AxvYhMeViXoMEN
+            DpHEMpYIZW/IabCvoXzTk8BdZb2gYZDp8WIlodnHyT2rCRPS0PFazw==
+            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2021-12-29T21:03:09Z"
    mac: ENC[AES256_GCM,data:WIoK7hdVGdIleSvlRO6OniQ8z94NtDOTw7g7bWDRL+M+fnaGwU7J5JeW6fuUyX45Kh/PbDVDWh8KSbbU/gCbhI6hhyFsccFI1imDvTJ4ryoLO8+yoRmBd9+aaIbjcrM8PfZITlJdyu7NewnuQ4kesfwWh07m2IxB2xerErrkayw=,iv:iBYU/PPe/NqIAUhEwSNVwHdeijs8sRZVx5d7qoNzAE8=,tag:D04BxYAjsS/+EXbjfIi1EQ==,type:str]
-    pgp:
-        - created_at: "2021-12-10T15:35:15Z"
-          enc: |
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMA6BoiFpcAxNSAQ/+OSwvGygGaNXlXdgWAcPC0QsYdYx2qGEfK0V0J68XNdvJ
-            3dDc72fWz0w/aGW/tmAGMCcOLjhbl5lveVEmSdBETngVyQYG4xyv0WNs3104IqK1
-            XxZO5ZOTuzrHJBmdQUdLu6Ig/ciEKJlhY314HxAb6oelNGCJX58ZhjwkxJSwJRc4
-            /5lAlYe7b6MX039EWxl1NpSpSE6IWq3OeOKmMQfO60OTmSGKiV8HF84PmG0WzCRn
-            TJ34n/fO4fS017H7YSi5VGo+MQ0GSutSyPK8UrO1UovePupfyuOIz9W8vCFMo8Qz
-            Uef/MrN38sEl4UVsK7GQ0DbXaLXfbNSioAZORk0Lnpwrf8OHt4IGc94Vu63Bn4Xu
-            KJ/Lq0IjCcw0givEfplkdCtnEHADuTK4n8Qk/gAxjZUvqAUTkS68MxMc1ApzMMGt
-            IcOgKJors+J8pGfm0WKzKLl+KseP3Ek2l6pTHztjK/hTvr92xoCn0jQkTaS4ZrKw
-            pO6AO3s+EF2bzdVA3iw46Fl4vL0pCc27L+7m0PwEFKcQVtpoy4AATkqBSYCIgGgH
-            48dW/tSM8F679bt798CUOkrzG0+4c381nZQS76dioNa7zNDWiLXhrYIEwlgooXdN
-            m98xpFFEu5zOnCTen4yct5qmFXzYauqCqvoeqr+4/h6dwG8E169cbjPYyLU5v9DS
-            XgHsFJMx8eWn0fXHkcVOzyFgRGBNdgn5PXoSYokJiLCT0ubZwoSM3NE0ZlIoXFU5
-            ElfMHKSV1hhU99TJ29uTIqmjrH/vs8usHRg9isi75yHjH53Hq53RuYSNnheoP0c=
-            =SRmn
-            -----END PGP MESSAGE-----
-          fp: b785a9688947edabb9ec8933ee7adefe1d943c7b
-        - created_at: "2021-12-10T15:35:15Z"
-          enc: |
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMA2kjcrH8S7m/ARAAsq89iB59zGF5kk+t0zUWaTYxJzqee0lug949a32YMQyp
-            t1ECn1dmQyxEI2uVb+F0KqrLYIscR/ASKcW7QQ3MSld04YmNElFZ7IPUHeZMDu8e
-            KswRoPNB6qJBwgHswLrqxzYf29RJumP0HB1vh9rVh5hvr/RrtewTOCz6Glfk5Zr2
-            tm3xfWfEJWo1E4IgCJSn8xV2y8AsXJOKob4dyhpwGts9VBSvlSnhm5NpXpZqKscW
-            TPwIO0gWqioISv92mmr67pVwy4fb8QXQpdcbpAe5PY4csAfvLq+n5ARNJkNS/ImL
-            VKnSg1XIM7veLqik8ixi3DvpAoQZdywxxv8lH8oqsAp7UBFT+zc186z8axua+KBJ
-            zXbIcSfNmthiixItVLLts40r7CopPv7eK36QO0od9BikRjMvyzfmRo7tMJ6eQPeh
-            6ASfhcwpHlQWK2w8v06921/iXXKrRpKb1rITHoj7I3enyQjFFJ5p63V22/B/UnqZ
-            g1pV4Gs+ekfFz02juYOeai2Q55MysrY+ytIbPj92TdCLPg58kvjFWjyIxqOSCGAI
-            YzeD2IeKrq4ii54Qafx8Gnq+a/1t5jT2sYi9eem7n3u9gB5ymHEZriQ9p+jDFmQ0
-            NOqj9s6cqvqDOOzeoMYNUVXfcuNfjWJB3/as9paAalypV00w0tZHfqwajYeXkcDS
-            UAFo872CqsByrH64v/9ihvis4/8VoAsGBenGJylorRI2dyIC4DYUB+u3zAgU/v52
-            XD4fcleIym+icxCi6ZCRLS8DDXLLI9qurXbHiptQO4pK
-            =wCQo
-            -----END PGP MESSAGE-----
-          fp: 8eefb1f8c85704ca47aa226a692372b1fc4bb9bf
+    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.7.1
--- a/machines/gitea/secrets.yaml
+++ b/machines/gitea/secrets.yaml
@ -4,49 +4,27 @@ sops:
    gcp_kms: []
    azure_kv: []
    hc_vault: []
-    age: []
+    age:
+        - recipient: age1h7ddyj66gcqt5vnzphjfn6y5tul79q0glcdl0et9w44z2evl999qe02wht
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAySzBoVkRCN3FWa2V5R0lH
+            a2FnNlJ0VmdhUkRTV25qSWhndklwdUczdm1FCituSTFNVTlKOE1xMWllQk8xNVVz
+            RTBoQTNNOXd3U0VkM1dvaEJZUFNDdjQKLS0tIDVkS1VobVgrOUtFWDJCbng5M1pX
+            STNGQ0pSVlRYWVpqMjlUb2lNL1N5WlUKFiSZWuYSRsBmi17Qi5k3Yhnm11vo5umQ
+            W1JPYcfnH1jKnGsyzs/+jn6C00SmC/rzEuxF7Ur4UCRsm6YZMwC+nA==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1jkj6xrhr3uf52hac4wlda4a8jcegha86jf5lgv58df0xunadz53qpjlpae
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSejl4MlRVOUF5RFMyWnBS
+            MFhrL2M2aVFGZVVjK0h4OVRDYnVqU2h4UVJjCmRZMHBWZDB3TFdKa05wS2RZcU9B
+            NzVYMXVOUnpGcUJoM1Vxckl6TzZOUUEKLS0tIEpMZ2IzL3drNWFoSzdBdnJjS2lt
+            RW1CWDlrZ1FYSStNYVJzZHpkNWVaTG8KUxGxfbma4OE7UPlv3lDtu9v/h0Jx1vYx
+            7hfDVn+yOamCsqs77kmuTprQyAZbiPh2AzYxCkqy657XOdaq4gThWQ==
+            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2022-04-26T19:26:23Z"
    mac: ENC[AES256_GCM,data:8KcUH12RqxkuX7MQpm4Xtl0YNUnhj/ef55ix8mb59ncLfjWauM7KlYVJg+La0FrqvWOFNNsMTYiBNlt/1KU9tqJs7kjzQQvhkcUDA6jAnFKtLCV6X8fd+3mon2UUL6eh5FDWjy3lTp45VrWNwTjC+LP1RAGGG7ie4tuI69PM1h0=,iv:SoU3hXDCZwJk4BLgjFU00rQUdqxlD5j8LcdQ8RZvbGs=,tag:9uveuZWgDesins8lk5w9Dw==,type:str]
-    pgp:
-        - created_at: "2022-04-26T19:30:48Z"
-          enc: |
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMA6BoiFpcAxNSARAAmVgrY+u/uozCxB3xTegvh2C+VOW4yxDBKGFfM5/NS3PR
-            XneeBNRxJZ2BFsOnGtJZSsCkiD1FwVw9nYCnA1TCjw62gkHyJsvQziUM8WKrpIW0
-            RXHllXawOW7Lb0faUcTRF90Z//kVfk4o33Xs895IK+mk+iRpLdE0RrINBfZ7jb0y
-            OJ93wJ0CL7A5KtltUBthX+POqI12bbj7hnUtz05mfpQG6PcnRwMHJBUk0JPo4s4H
-            8ksJlPRrbwi7JU5XQTo7SDTp/IwbXbewCylkS7nt05znIOFIejC22XEv8w0XPX8p
-            ZwQxPvOrXb4f1PDFgv65ej2aXREc7sidwqg8hUiBsKBuxRjFQFzLcwhNzAKwv30s
-            Nrj4yTMn2qNIjhsfHfMgRpm/iwvpsAFWFUqGkwb3gs3V7PjOidRMB4xDY1QV9Pae
-            b8z18S4cFIh69Aev3fiDzopL5xF7ZBcayIjwC6RkhYzcedkz5oPl2tqqkJCiPQe9
-            ohxGF8m/9k/OhQRKl8HURybMyX7SwAXA9Tx1dNbb2xbPNaFXSBKxpF7B2k3kD/pQ
-            skuuHDl2z/deoD0Gu75+Svvb6jv82P3+KL9waaxrnfQQ3avX6hIQ9zF34jTxHbtr
-            UHAxEtuuIdER8756fWtgWshpdY2rWQ54flT6nlhtsNN1Io/flXdeof6S3hDiKAnS
-            XgEAVMKweW8Q2OhGhJZSEnP8IpRsPuGu3G1v8/L+lzJEK4edvUr9IgqGUq7Iqeql
-            7+sw+jFzJPsPhiFpvZx1pB1RGS50q6O/Ch8/AMK7SvYD6oSASYfa/ifzAZSapiE=
-            =r/Wn
-            -----END PGP MESSAGE-----
-          fp: b785a9688947edabb9ec8933ee7adefe1d943c7b
-        - created_at: "2022-04-26T19:30:48Z"
-          enc: |
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMA7iSLIuhZxC+AQ/+Pr6/373P/TKxh3S1rg2SwIlwJ6pZo4E4JZBmCQ+YTZNz
-            WOg9WLUrMVAgax6dDTf+GPPCLphI7SfQjPqpHEOw/eUtZhSqmcq61no0gVyDgv5s
-            KHPrary79dVG7xw9i/ipc8LPc8hujeXHD4hzv2iYlod4LhjPwR4WsxaQJ7fbaU5V
-            V7Gu4wzdoiOTl1fthXaUAqjgJ/iRlQhML5B46dMVg5E7g7GKmJjPuBhDWIAz+/2Y
-            fNY5dWL7B5R67zFmrxUUa9Wbr1SvEViR4bKaUURMhixzgWAxgQ79zR4B3J1D+tW/
-            2TnpPgP2b5ikMKbUFBEX7x/oGmvVn4DJcDwQEM1X5+nMOpT7j4cx0NOnhUkJNfdW
-            VJK2bN/XBlfy9SnAz/nzleKzO+p27LvBfnyvC4fC9ZySNfVWdcDaqCRbF0mfHWB1
-            2C0HfEAQe7X7Vzpc3w+FyyZuQRNixTQjl2pouJIVWQOUFGy5Xn5yZgWrb93day9K
-            Q2zem+jMHQQpDc/KPSh1qIgboAh7UnxhfKJCUUortL6eMOL7UQi42qautDngl93D
-            opBSf2my+gqFajV6Y0vYO9MSGFd92XLwqQXnJMPEHm/aDsQRxW8mf71ZMu1iMUns
-            IU8nPgki2VC3Z+OnSYdUv8aSY5K341xODfntmrcdO/Q1dvsXEyPtZ81BQn4nY2jS
-            WAH3bwUphfdA/PNBRTGrYp/TiTdhj1cGtgyjY1QgIA2i8PTRAD4nk3kY6qwchUJE
-            Mjx0i74gMqFOZ81iFS1ohiya2zhP5mwbLzIP4hdt5J9UvDozhS52VE0=
-            =vu1S
-            -----END PGP MESSAGE-----
-          fp: ca0dba2f767679957879077fb8922c8ba16710be
+    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.7.2
--- a/machines/loki/secrets.yaml
+++ b/machines/loki/secrets.yaml
@ -7,49 +7,27 @@ sops:
  gcp_kms: []
  azure_kv: []
  hc_vault: []
-    age: []
+  age:
+    - recipient: age1h7ddyj66gcqt5vnzphjfn6y5tul79q0glcdl0et9w44z2evl999qe02wht
+      enc: |
+        -----BEGIN AGE ENCRYPTED FILE-----
+        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRWnIvTVljMWZKVDVyNENl
+        TjBNRHJ3RllaQ0JZNXpCZlMwYkttMmVGeVQwCkExNzNDY2ZWQ0xRdk1rdytYVjls
+        SFFUNVJndHdpQ2djR2EzYklHYUErd0kKLS0tIEpoQkRNcFUvMXhmQW1TKzNESHhL
+        U2NROUNJQnEvaG1ZNVVEd0txUndVUjAKnnkLobhykAYvhE1N0rfgR/supQ4mCNP/
+        5/UAkFCbwNR6tAJHZH72grNh5mzl+fCyiHmDGOMgxhTyL/5lC9k9ZA==
+        -----END AGE ENCRYPTED FILE-----
+    - recipient: age1m93jeyexus2uqvrk99r7hh0xp7qxk55tgmju4h422dfkf92jce2sxpntu5
+      enc: |
+        -----BEGIN AGE ENCRYPTED FILE-----
+        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuTkxwMHkyeDRmUUZZZFFG
+        cThxTytQSjVmcGdiY2d1U0xrRkhUMEdBckZNCm95WGF0N0twN0VrU1U3MXdPdE4x
+        OE55eXh2RUtOUnBwbmVaWGdadmlBUG8KLS0tIEFqdW5PSUJmNjd0NlFMTEp3cjRS
+        T2d0VmRoQ1J1d05weFF6ZnZteVd6SWMKRcASrez/JICMurAuQJaW3GIS7lXPUOoj
+        KLYA7ComIU00hewiugZGSrcvmnJ5fuEMERx9yk+6NrxsBGoExaddag==
+        -----END AGE ENCRYPTED FILE-----
  lastmodified: "2022-06-26T17:17:46Z"
  mac: ENC[AES256_GCM,data:ifCxcuSVCjlzd7l99q6gbhg/GYw0SBwz24N7Pjhynuq6CMBTGYH1mItWkBTdPhaM1r2RokSutSxmPSJfWAE/9B21p1wJH0RCKKoWyGAu7VlKMFHvv3xcIGNiZhcNfk3/zmZT4SifDfK8iA/VHt2dJlFomZhBvntIwnyRUEhEa7w=,iv:N6JOY9ceWB6d+87XsoYnJRI7RJ7WwegMMwedPIYLbfA=,tag:eB0lcAk2ZEyXBdSp19XX8g==,type:str]
-    pgp:
-        - created_at: "2021-11-25T22:00:17Z"
-          enc: |
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMA6BoiFpcAxNSAQ//R7e0KvxQrF+UBrs2TA7vP5LvPHAB+Isnn1VueHDxLj5j
-            UcLi1ts4rDquDiWdkJVN+A53hOee3IvOe+m0BkVJyetEbocEaFgwpRmzhSIhTFvX
-            jQI3C+Mn+WtYmq6vUcC7mhLiBgvGFRueQNcroYEAZFwLSYKLUM7nT01Njn4ADSIi
-            EJj1Ogssgt/jptB71jA3DD56+yMayCKsB+5XtaooZn7uEPPxZKyhcGcmx8a7anBr
-            V8bil0FLGqx3QaRGgXqj23kL8NOOCuJGdyQFeNfRVXyXjK3FQixCXfYKv/li3hOZ
-            Ge+gh3o3aiQexmfxh5Yi0u+KiyF5jlG/FVN9VSGi2sDrnjNUW3KX/eS2Rkd553EA
-            XhnVMoMztKpQ0DhZmvcTT9ynKTJrG28OXsWkWRe4zfrwHgBnfyEnP4TXRlAgO3TS
-            6giORbtWTdTVedYW+tbwK1XLxrqDfkMsSBVYgL+x96A1RQMYZfRvpA8kKsefN54p
-            stKeOySSo9ypquxzA0mdogyvhhIa5Cg0fSCzOE+Y7P4GRUe+OGqP0rMpIBzZsfyF
-            lefXRxBGL+1wtaE/zNqI1Rf0jxzFlF0DExfAcqveIaElCQJbTWvhalTGSD+O+oVj
-            Q1HDpa/iu0BqlzBMEKGxUhwqtsl/prpYMSKxLTgjqfCOecwNyVEpKTRFnFlP12/S
-            XgHa43zpA5RYfcp4hcB/3XeAt69AKwnJKD+C0Pv5l2rTveD8/jgZnt1NfJohTm58
-            chz6V0qSeGro41CjP3HEdzD+iIez+Dyv8BWahLvznTNeHROCHat5SLeEf9FNm9E=
-            =onPc
-            -----END PGP MESSAGE-----
-          fp: b785a9688947edabb9ec8933ee7adefe1d943c7b
-        - created_at: "2021-11-25T22:00:17Z"
-          enc: |
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMA+2dauVNvLn3ARAAmQgafR035XrvwMSOaGq+N5VbSC0FhQ0dJbNkew8ixQqT
-            iR3AIHKDv8Uvdi3XlMtupVD5YIlazc+NoOKJk1xzrvYGO4bouH1k0KinXbea3Wm2
-            5NHSPWwzkRkA+S1GawsTgBx3IrWlDagsCADZ7B4TGuEuZt/i6J/C56JikG7aIpM4
-            qgm+KZBTbyW8IHcVjoDqTTtEdhU+1IN3MtgzQeI362nKTn27LnoLsLxhXg2mHQcM
-            8zu3D246mRriwPgfXAyADwx57k7G06t63JwSCXzzY20H2m3DFc0Woxcbo8zrkLLp
-            NZKirM/LS3wLELg+e+NYk7dZG/s1tR3ZL000wss97jZlTbRUr9aEj6YVklG4kxiW
-            v0IsovsFqqE+IgYEuMacYqteBpaKduixxooPsRYTvsqJubhAPWD7oe5bGgojF0i3
-            elTT1nUY9w9JMfutzUSzYBV+1ld2hpMXDGKZ1uNUionfk3+8NBXql/NE90mvlVhv
-            FDmnpVF/DsuS68tkb5FvZ+gI1prjz6D0TBX9CKbQTGNef6mm2Jshx7zzRGx1w90X
-            M9sN/KGEkeYI+htxw9zC5ulsuKZTf00omsl6mKX7cPOr0tQgRCN+TMpGwGbRjP2d
-            31uXUPJMyMDQpO3qFq5Ak0iVHBp0C9FyRyLFD1E2AJGnOVTKXFDgPZCViAWIGdHS
-            UAHR6gC+bPX66ZEOjMFqDl0IsWyz/tphkdIbVce2j+/KcMbntqNxUI0uP5sWySmp
-            Wke3WX8EENOQUbjr9KHNg+n4Er5NRyJ3czSU6jtydo87
-            =Cpa9
-            -----END PGP MESSAGE-----
-          fp: a6e31f5ab2bf34ca3f614d81ed9d6ae54dbcb9f7
+  pgp: []
  unencrypted_suffix: _unencrypted
  version: 3.7.3
--- a/machines/vpn/secrets.yaml
+++ b/machines/vpn/secrets.yaml
@ -4,49 +4,18 @@ sops:
    gcp_kms: []
    azure_kv: []
    hc_vault: []
-    age: []
+    age:
+        - recipient: age1h7ddyj66gcqt5vnzphjfn6y5tul79q0glcdl0et9w44z2evl999qe02wht
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOVldLWW9hK3hTYmd0VmdU
+            eTR0cEVaZW90dkhyYXpWTEZHQ2gxMWJ1dkJNClVPRjVSQ3I0TnY2L3ZKZk0wWkwx
+            dkxTcnBiYjNYdFpqYW15c3pNQUdWcEkKLS0tIGRLY3lUM3pvbDlCbjhOa0Q0a1RH
+            c0YzaFFNbWwzRlpZQ1JvR3hWQVZZTkUKa8IhIN2QogEsOljUhnRzDeDGNHH+OIpM
+            E/fdNYFkcZ6kUSPi/Zl4v9Johe4HReUXQdy9RfXLDEiqoBne3MQhIA==
+            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2022-09-07T21:12:26Z"
    mac: ENC[AES256_GCM,data:BNDGUuWDLG48nph3HUKizMR0D0KJTYTpkv15Rs/3ljc3BQYdKbeLIh+zKPvKv93VOvweUXCX/7pwxv9ENdVhF9BYqwoF6gpbaM10iSOvlaEwoYMuSB+pwcDRg6/jCJoJOxJwKXggfcAU4x25Y81oJxb/xfe/KvuLougq/F4z96g=,iv:HXmtyv3ZdofjDtEHBWGOdNeDqGXO/VI1EqXzhpcmHTc=,tag:4LF5HNTG65uGpoJqQgh1cQ==,type:str]
-    pgp:
-        - created_at: "2022-09-07T21:06:54Z"
-          enc: |
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMA6BoiFpcAxNSAQ/+MhiPgneOuYKUYYjX5qscgoJPLoeP9wSWBoefx64bwHIn
-            5e2wcgKkAKlizk7UTLpDOKtD7zVWXmS9vL0ZJQ8Xs48YG4p1VTUgIaTUAm/fjTXM
-            TEWbCSjS2she25yYFEPtjvdCLZDPnIuR56p7K0mtHfGTEZ1rGqYyRARmCVTXv60C
-            xGp1pGuNqxV5Sbwn11o/jpMiTo+mV91s+Ui022W4+tUYWz5Kdjkc3KwaGuzYWfEE
-            j/vEDiHU4WxMGv1StUr7yGi7FtePuFWiP+u9l5V4gN93G1noIdsZtk/xsKUV2KqA
-            rfvgRPS+DEOWUlOw+hjUToJQAr/JIxdNOhv4fiHW6SFTdnk9v6HBi1jwsMLsSN/9
-            FlbtHecUt3YXiyvu6W79he0RHSgnqQXo1kMVUYZepRO2Yj63owBxP6Gw/RWGI4UR
-            ev3DbhfO8ltr7Usgb31Aqr29s88P6CbfvteYBaQSFss8IwJGuNsV1hFU9kV9wnta
-            NGSonpkOBr6FZmgTR3GK8nQABfGtJ2D6ATaiGUyzp0Lds7Lr9DkpamGLLf1eiS2X
-            MaGxBM6tWs3uDw8o7u6u0Lv/LjOgSt+xxs2BEPCgRXd8jgWUzjmDDB2RDkhCERmw
-            P1bV/XIvwsnmedOKoF10Cz/ITcVntZ3A9DbpVuLkTmf4+IG4blxJXg9DNWpPEMjS
-            XgFtH+Cg24eloqkDyjTbF4ERdZwknbyPpNK1/t4NMNRIfFssWqLkBUOn2s0OkLqK
-            8POJBwLInoIz9jTCCJr4iUmH8X4kldYvED+7IMVtkRzJeWJss0b1qth958o87+0=
-            =uUiT
-            -----END PGP MESSAGE-----
-          fp: b785a9688947edabb9ec8933ee7adefe1d943c7b
-        - created_at: "2022-09-07T21:06:54Z"
-          enc: |
-            -----BEGIN PGP MESSAGE-----
-
-            hQIMAys1wiNZOPYDAQ/+K7Yvnx4Vj963tJh/gFyeK7VEmnMIb9kdq9oe5/0LLapc
-            TdWRiwwg4KsavLGeaGxzLdCKnKX3EFzWZXREey4ffHK4sBq1EvAG4oGS5NXdS8u6
-            +fv89KfL3QSNOIylb5lN1dGLUsFncwI4x1dFkJog3W9XSIEJcGNxR26rrIw49YEC
-            ElbfLKoTXhzxuEkrkWYFU+Qzvc00g8T+pUfWiRIoTA+WzvZ3/7zcSAn8YZuiGAn3
-            pJUkK2q/IyN33wXRkPfhHFVZ94TdpbH0z1JgCp3zC66GtPLOgEnJER/8TuZKDmmX
-            RtiM/2RtQ3s1c3vGcv/sHf8MAeN2wYeoAl/NAdiSS6WuH/yXHI0HqpudvnKJy1oL
-            hsrORmvpmxhz1If9taA2VJ3Ofl4s3ZhlJNrWhHc2nY8a0EJW5NKzDQxFaSlq8dR7
-            YqC0nlDaMvrgoIYgIc8A1yjsfyyzJ0L4X8H3a57VcGX2Ceui3azL60O5YMi+91Et
-            JcfO952BWxw7cjVD5Dvmz8BjFurTCs4YFxfueaHOVqN6h/I4RspxaCgUH9PuoW1S
-            CfvWXGroUGaRoD4IIDaj4iTvj99lKIVZYwzsVBeftonJ3W+O4jrC1ByWhUPLDaI7
-            ahBWmch0bgZSHVRMtGjtwj88z6S8gZjSodEMmY80bST+b8/tTEgLkPhsFQheLh/S
-            WAF3qAnCh33ZFLj+3eZZ53e/jshAixvNOLDcJtMR8Azd81j6xYy67W/n1/K88la7
-            yBrUEUk3VeDXJlhndtt/nlD7rBC7Yy8z/LdIPt5nkI6OfjICs/ZN+ck=
-            =AbO2
-            -----END PGP MESSAGE-----
-          fp: 554dd0be7ba432b2a2c72df52b35c2235938f603
+    pgp: []
    unencrypted_suffix: _unencrypted
    version: 3.7.3