From 91def25bca5d5fe618ead529c477e0f4283a32ed Mon Sep 17 00:00:00 2001
From: Henri Dohmen <henridohmen@posteo.com>
Date: Tue, 30 Dec 2025 16:42:25 +0100
Subject: [PATCH] fix assert

---
 pki/syncthing/solo.cert            |  11 +++++++++++
 secrets/syncthing/solo.age         | Bin 0 -> 331 bytes
 var/syncthing-managed-clients.json |   6 ++++--
 var/syncthing.nix                  |   4 ++--
 4 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 pki/syncthing/solo.cert
 create mode 100644 secrets/syncthing/solo.age

diff --git a/pki/syncthing/solo.cert b/pki/syncthing/solo.cert
new file mode 100644
index 0000000..8a85a2b
--- /dev/null
+++ b/pki/syncthing/solo.cert
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBoDCCAVKgAwIBAgIJAKTDW3t4qGfwMAUGAytlcDBKMRIwEAYDVQQKEwlTeW5j
+dGhpbmcxIDAeBgNVBAsTF0F1dG9tYXRpY2FsbHkgR2VuZXJhdGVkMRIwEAYDVQQD
+EwlzeW5jdGhpbmcwHhcNMjUxMjMwMDAwMDAwWhcNNDUxMjI1MDAwMDAwWjBKMRIw
+EAYDVQQKEwlTeW5jdGhpbmcxIDAeBgNVBAsTF0F1dG9tYXRpY2FsbHkgR2VuZXJh
+dGVkMRIwEAYDVQQDEwlzeW5jdGhpbmcwKjAFBgMrZXADIQDwc6IDr9yIEOTEt0Zy
+jVx8lnKcJ+hmkpF1ECYNrqkVRKNVMFMwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMBQGA1UdEQQNMAuC
+CXN5bmN0aGluZzAFBgMrZXADQQAHx/XBdRkXx8Da1qC1YyHd3mBlpP3EzwolNLEy
+36SuBYtik5qkf9/mLUTcxoobXNSLslZCU763HI54803qMwEG
+-----END CERTIFICATE-----
diff --git a/secrets/syncthing/solo.age b/secrets/syncthing/solo.age
new file mode 100644
index 0000000000000000000000000000000000000000..901be70c28292ea3b648e863b721d0a5934b6c8c
GIT binary patch
literal 331
zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCT43-L`VD_4jL4s=iS
z@-qsI$j@|(DDx@EP0h^>NDgt+_Hy@&%Bu7a%=b<9DGM(TPUo@=EKM#74G1m{$}+J`
z3)Hqu&5R5VkBZdy_ASWq&+#&HtMrO+%P<MZHsI3L)m11>)Ax4{sY<VK&Irvh4e)TT
z%1=y6jY_L3@-QnYFbHw+Ob)9^Ny#ZJHsLDITyAZgD0N8Y)aQTu61PX^8eJ;-@vd*{
z+}a~4djFrOFYxTC&Q+6pmwb<J*Ok8CCl0-z^Q(HB7NhKqr!7B&=LGGa@w?7f!9|I4
z*579=Urx?_#oT#UlX+h0s)oJCtP&41n7;U})3Am6-h{&zt91%D$E=U~zoN0uIAW*2
j$+O7^*Iu1;Gb>5=<Y9@P%Cqk58DAaWo60D3G5!VsjNglt

literal 0
HcmV?d00001

diff --git a/var/syncthing-managed-clients.json b/var/syncthing-managed-clients.json
index b7b0419..cfb71d1 100644
--- a/var/syncthing-managed-clients.json
+++ b/var/syncthing-managed-clients.json
@@ -2,11 +2,13 @@
   "managed_clients": [
     "fw",
     "roam",
-    "c2"
+    "c2",
+    "solo"
   ],
   "hashes": {
     "fw": "YZGGXOT-MPFD7O4-ACLGOGT-LIMZVD3-7JBSZZR-LFCFWQL-BLO435I-LLH6GAL",
     "roam": "HMB7ZRF-OODFHHW-2QCIFFJ-M7COVK5-YUB3GKT-SI56D2U-CPTTJEP-R3ZKOQ7",
-    "c2": "PQUPFUD-S7ZKSTU-WDV5KXV-O7QYJNT-4MUEBG3-U577XAV-ITUKVJE-6IZEJAQ"
+    "c2": "PQUPFUD-S7ZKSTU-WDV5KXV-O7QYJNT-4MUEBG3-U577XAV-ITUKVJE-6IZEJAQ",
+    "solo": "GFXORW2-TTT6OO4-ZTFOTID-AMKNQM7-CHXLDN2-HCTAC7S-IM3OUWH-WSRI5A4"
   }
 }
diff --git a/var/syncthing.nix b/var/syncthing.nix
index e4cd69a..6604b69 100644
--- a/var/syncthing.nix
+++ b/var/syncthing.nix
@@ -6,8 +6,8 @@ let
   };
 in
 assert (
-  lib.assertMsg (
-    builtins.attrNames hashes == managed_clients
+  lib.assertMsg (lib.all (c: lib.elem c (builtins.attrNames hashes))
+    managed_clients
   ) "Not all declaratively configured syncthing clients have keys. Rerun ./bin/gen-syncthing-cert"
 );
 assert (