From cfc871cce6aefaa0ff64619780a807cba761c6b2 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 30 Jan 2023 12:20:23 +0100
Subject: ...

---
 hosts/surtr/etebase/default.nix | 14 +++++---------
 hosts/surtr/etebase/secret.txt  | 16 ++++++++--------
 2 files changed, 13 insertions(+), 17 deletions(-)

(limited to 'hosts/surtr/etebase')

diff --git a/hosts/surtr/etebase/default.nix b/hosts/surtr/etebase/default.nix
index 3c71bed0..ca6d84fe 100644
--- a/hosts/surtr/etebase/default.nix
+++ b/hosts/surtr/etebase/default.nix
@@ -32,16 +32,12 @@
       restartUnits = ["etebase-server.service"];
     };
 
-    security.acme.domains = {
-      "etesync.yggdrasil.li".certCfg = {
-        postRun = ''
-          ${pkgs.systemd}/bin/systemctl try-restart nginx.service
-        '';
+    security.acme.rfc2136Domains = {
+      "etesync.yggdrasil.li" = {
+        restartUnits = ["nginx.service"];
       };
-      "app.etesync.yggdrasil.li".certCfg = {
-        postRun = ''
-          ${pkgs.systemd}/bin/systemctl try-restart nginx.service
-        '';
+      "app.etesync.yggdrasil.li" = {
+        restartUnits = ["nginx.service"];
       };
     };
 
diff --git a/hosts/surtr/etebase/secret.txt b/hosts/surtr/etebase/secret.txt
index acedb549..e107b0de 100644
--- a/hosts/surtr/etebase/secret.txt
+++ b/hosts/surtr/etebase/secret.txt
@@ -5,19 +5,19 @@
 		"gcp_kms": null,
 		"azure_kv": null,
 		"hc_vault": null,
-		"age": null,
+		"age": [
+			{
+				"recipient": "age19a7j77w267z04zls7m28a8hj4a0g5af6ltye2d5wypg33c3l89csd4r9zq",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBidVRZandlRmhUQlBmQnBW\nU2I4bWwzM1ZoejAxdlpvL1lMMXhKcXg2M21jCkJuNGI5cHkvQmVGRVRrdzlpcTMr\nVC9nMVh5Q1podTVDQjVRY1paeFhGdlEKLS0tIDlVaTVZZmE3MFgvUlNDWUdwWmFu\ncEZJY2syTkZ5b1dzdldBY0dPYUNIYUEKZACWetBikotrKll5VWBDzaCz5lQlFE6J\nSTbnYhwxUIva/QdYGoFIQHaTHRVc5pG8uGSXSmW1QcprQ9BJnHwFNQ==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
 		"lastmodified": "2022-11-09T15:30:57Z",
 		"mac": "ENC[AES256_GCM,data:zb9S3tgUEja6IfCvrh6AJkzoiqAj5RyBtEvHHV7RkANGHxRer79YdDJW39I4qrg2WC8odr5CyJF3sVqw4fUeUeeq0QAJYupJVmINBqIaFcy6f5XtFDpHRNPmHT1WwrN6t5o8pqb4cv8H7JRfjySxlwFNmItgrQIQn6QBqE2ZkEc=,iv:BTzROI/DxqCmRYzsRkMrj+kTG3KTLP+nAF4z0l/dRbU=,tag:S+w0+XL55PBiHWkUKtDggQ==,type:str]",
 		"pgp": [
 			{
-				"created_at": "2022-11-09T14:03:17Z",
-				"enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DXxoViZlp6dISAQdAfsNj4UmCNc1Qo5hi1YLaRjoeoudRZwNgVfaQTMsOPA8w\nfuIRUgq9Mybq4Frp4U/l86LwekOIwiF5tk1hPcK2HrmHG2z/ewr6WnrhczjFy+Qi\n0lwBMEtZWrD4h8GdTwan7E/jDLytEZYjDmXK72Ep5PubyO86H1BKy4Da5YIZw4Bc\nq3RaJ65wcp1EwIJ7gbEvG7a1a00AjFhXIwtsT/DhKTBy/OwPj9w4mFJ5rka8FQ==\n=2FIT\n-----END PGP MESSAGE-----\n",
+				"created_at": "2023-01-30T11:00:42Z",
+				"enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DXxoViZlp6dISAQdAvE9VzEnmrMOn4PvS4PuDFxYaVK+YMTvT+fG1GVJdcDcw\nxr/12h73rdCTfC/a4cBN2z02NMxpaQAN1+HMi1k3C2eeSXS+q3ishXjv7CIaNfE0\n0l4Bs5Nq78QXIxcZGddsfSxQxMJSmdbSv4QvRyesGM6dvfEQnLfG+79O8qppC3BG\nSxd3rwOqPzqFcVXliTe2X4sxhv8xS06z40eyWiJTqP9nuF4BW1wPe08VbP0kVnzC\n=153I\n-----END PGP MESSAGE-----\n",
 				"fp": "30D3453B8CD02FE2A3E7C78C0FB536FB87AE8F51"
-			},
-			{
-				"created_at": "2022-11-09T14:03:17Z",
-				"enc": "-----BEGIN PGP MESSAGE-----\n\nhF4DyFKFNkTVG5oSAQdATs6pQrq07RGgFTTrNTI26pt3WSSF8tg9ywhepFvxfyUw\nItZrRfQUi42Yj6UC0GuxNmVYcS/Ogv7SngtM+22kofS476gfhkHT45/9gMhqve0D\n0lwBPaW0UHfU8Z3tbA6aRpMSYF20Srvvqfs2Q+PFSEWDFXx06RqpmH72LrhI3uYm\nbK9LykI7ucQAGJSSkHJQEbvEqyv1CMFGdDHkI1LyAetmcqgPZH8JRPx3LDagyg==\n=EsHC\n-----END PGP MESSAGE-----\n",
-				"fp": "7ED22F4AA7BB55728B643DC5471B7D88E4EF66F8"
 			}
 		],
 		"unencrypted_suffix": "_unencrypted",
-- 
cgit v1.2.3