From 4c700a89e59299978ba3ef0406e6b8d0e31ea81d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 22 Feb 2022 10:57:45 +0100
Subject: ...

---
 hosts/surtr/dns/default.nix                  |  3 +--
 hosts/surtr/dns/keys/.sops.yaml              |  3 ---
 hosts/surtr/dns/keys/rheperire.org_acme.yaml | 36 +++++++++++++---------------
 3 files changed, 17 insertions(+), 25 deletions(-)
 delete mode 100644 hosts/surtr/dns/keys/.sops.yaml

(limited to 'hosts/surtr')

diff --git a/hosts/surtr/dns/default.nix b/hosts/surtr/dns/default.nix
index 27f0715b..b5be6887 100644
--- a/hosts/surtr/dns/default.nix
+++ b/hosts/surtr/dns/default.nix
@@ -141,8 +141,7 @@ in {
 
     sops.secrets = {
       "rheperire.org_acme_key.yaml" = {
-        key = "";
-        format = "yaml";
+        format = "binary";
         owner = "knot";
         sopsFile = ./keys/rheperire.org_acme.yaml;
       };
diff --git a/hosts/surtr/dns/keys/.sops.yaml b/hosts/surtr/dns/keys/.sops.yaml
deleted file mode 100644
index 4f536273..00000000
--- a/hosts/surtr/dns/keys/.sops.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-creation_rules:
-  - path_regex: "\\.yaml$"
-    unencrypted_regex: "^(id|algorithm)$"
diff --git a/hosts/surtr/dns/keys/rheperire.org_acme.yaml b/hosts/surtr/dns/keys/rheperire.org_acme.yaml
index 16f6d19e..d748f3ab 100644
--- a/hosts/surtr/dns/keys/rheperire.org_acme.yaml
+++ b/hosts/surtr/dns/keys/rheperire.org_acme.yaml
@@ -1,38 +1,34 @@
-#ENC[AES256_GCM,data:exIBsQRSUnOhewl0P3WCqktpjsdFFIJ610rodabSsbKK/XF/0WwRU2ErAyv3wlmtXUJMY3jSugkzbRmnND9GIrj6n8M20BVoOeXzUA==,iv:SJBizi+kSa80964nQ78+43sapNDTGifSiV1kOheuujk=,tag:j4eowYRr4cmwUzXGwm3CAA==,type:comment]
-key:
-    - id: rheperire.org_acme
-      algorithm: hmac-sha256
-      secret: ENC[AES256_GCM,data:rgw4nQczDhEeI5JMl1fJA3HX5ZVBpjTQEEk2pkA3c9M1CWYpFvzFRtCAxe8=,iv:Y0G3+A161Lefpwknm+S2jj8rTfm/jlrP+pnR3vR6/mk=,tag:IHsCnkIU2p3hCmRokecbtw==,type:str]
+data: ENC[AES256_GCM,data:NkkikHThIEWXOMOpBr0KodTgJOG8wgG1hayZ8e++lNgQ7IcVu2j0MgQAbwZvAGfQ/6EQFzdl0KULifDLvqrL2HA4lID6QRGRfEG+t0EtdudL8F+LLhDYywrZWETEL9bkhZ9N7u1ujACSEuohju3fwdu0lSpt5gyrqMT0/FgQaugRmP8xdEhtiXXkZ8mjnch1whJ9ALVIMwJ4AO2vLLs4T73Iw8yOHEFCkRb1Ve/W78NghfYBxIQ9RqwdOTb8zeZI9rM/BoJFZNs=,iv:GUo9glw3Pt+aNT67CwyQ2ZhfJSNIBJ8friuuqUKoDpU=,tag:SkL2atC9wt/ZkIAngp/eQQ==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-02-22T09:17:59Z"
-    mac: ENC[AES256_GCM,data:tYWQT6iDQGsYm4zCtNbqvZhIYIMm3+Q9faRbqVpeERdq3oJlEvKIL3MAP2fj6789EbCKf/6zdah5HzYK9k4RsZWxtPfqxYXZp7gWvWwKwm5MRZfQtYzR7ThhD/8QANJKLVffl+PknJqhUYsUq9aeYTbLnyuR2AHY1WkR/fPwcLg=,iv:wGmozslNHE1dc4tpmNVGQJw2hhojB4L3gf7qu963ItA=,tag:4WrPw6biusQDV1OTWmXv6Q==,type:str]
+    lastmodified: "2022-02-22T09:57:31Z"
+    mac: ENC[AES256_GCM,data:gYviKwnOEezRm7eJPVLKjPnxULqYQgMtn8AHk0WWfDqxwWG9OzJtFB+tON8I2pCLoicC46tR6ArgkcQHbC0OER1D+bNGRxqMzmt9nlMLzRUMHG4W4FiCTZ5MwCVWVaiJUuiEDTYfiJGWcESiWc8SYp7kjZPkZ637MZLgbwkRp7A=,iv:bl3q+oVdtnqD6bSHh/JcuWwp8SNwL8758q7E1fUppVU=,tag:JkdAhoS10IXOBtlEb4F/Xg==,type:str]
     pgp:
-        - created_at: "2022-02-22T09:17:59Z"
+        - created_at: "2022-02-22T09:57:31Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hF4DyFKFNkTVG5oSAQdAcxKwhh0Poivpl/A7YU53ab+rMWLWKRpeUSwehL6LPEMw
-            zv+AtmWUPtAL1GpyruFTYoT0P7CJ/PJLYYUDZPH/4oNcaU+5XiBi6sj3svWH5HQE
-            0l4BBkvxjYvgPNYSw68AJz/AlzRig4SL7q1VwaYH9w+UWnpwK2CeIZSn11lzDdcj
-            8jUZK34aJFFcGWBM2ZKEtQDm3n5B2nRxwb5kLjqwith5zczJ289VNPDmnlVRU4BA
-            =i8zc
+            hF4DyFKFNkTVG5oSAQdAv/JlsS91dXdEfb3N9Ui9e3QWlyzXG2RnwEYtpRAA7Www
+            rcxaGdBszfSsn7Ef8gq7n/Kv4l+TlAjwLnpaBK4ZRuSByl3DVns0MDq+nSmSYbre
+            0l4BB20ezs1ZzrKQf+cdXBKc77QEyNR4KUqBf3ys0E+dVizdjIpzZy1tG9hH076B
+            igMLb9lc+MteZR41WUAnbrEyq/q80juO4H7QBopmlID61Vl5ZSB0h+YYOm/lfeXT
+            =gRz3
             -----END PGP MESSAGE-----
           fp: 7ED22F4AA7BB55728B643DC5471B7D88E4EF66F8
-        - created_at: "2022-02-22T09:17:59Z"
+        - created_at: "2022-02-22T09:57:31Z"
           enc: |
             -----BEGIN PGP MESSAGE-----
 
-            hF4DXxoViZlp6dISAQdALxbhftpZmVeTmFU8ujPPR5w0Z8ljkZbI8SHAWmC2QEIw
-            iTS491iicbH7kzF+l3SZZ1XAFn9p4ZjQyZNeOHXD/q1KXxCWGn3UTRSbXlgzzmKZ
-            0l4BSZpnpgmEgLospl5mS6smVEO58Q3XXjVTQVKAjQaxD9Oe1DRCgW4kOq4xKGWS
-            xF55QHP3bPt5ziF2nwF+Gs28HW4UzAFVcr7r7Bz9CxwHixFx5qjvzAWh+Pp+TdY0
-            =hSUL
+            hF4DXxoViZlp6dISAQdAsnf/vLI0xu63KWnqkUNTVFL/hydt0WiQQp3GVYVc0Ecw
+            w71WxrVCO8L6KbsJMdQfcuxJlBfCT+cDQYpQSiZZ6ePS93GnTCaweL+AmGiNBFlb
+            0l4B16ip2zmyRxXjOQV92BJ1tOWUVqYvBhxEgZI0/lEEiCFs+dGTLAq2F7N1jD5c
+            v/BjXFEUmN+ukBLeFqjPJcLEtHVF0tj3tkl0WvIKqBlGa+Yt56xL2oTjP92DiZwX
+            =cKnB
             -----END PGP MESSAGE-----
           fp: 30D3453B8CD02FE2A3E7C78C0FB536FB87AE8F51
-    unencrypted_regex: ^(id|algorithm)$
+    unencrypted_suffix: _unencrypted
     version: 3.7.1
-- 
cgit v1.2.3