From 07c4b0c2b9f70354f9d7bc34e1af02056684761f Mon Sep 17 00:00:00 2001
From: David Landry <david@dmwl.net>
Date: Sat, 25 May 2024 15:03:10 -0400
Subject: [PATCH 1/2] Revert "chore(syncthing): try just mounting one"

This reverts commit d6107f53e08847108d5eb51947446b44f690282e.
---
 apps/syncthing/overlays/media/deployment-patch.yaml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/syncthing/overlays/media/deployment-patch.yaml b/apps/syncthing/overlays/media/deployment-patch.yaml
index cab1ae7..18471c0 100644
--- a/apps/syncthing/overlays/media/deployment-patch.yaml
+++ b/apps/syncthing/overlays/media/deployment-patch.yaml
@@ -7,10 +7,10 @@ spec:
     containers:
       - name: syncthing
         volumeMounts:
-          # - name: sync-keys
-          #   mountPath: /var/syncthing/config/cert.pem
-          #   subPath: cert.pem
-          #   readOnly: true
+          - name: sync-keys
+            mountPath: /var/syncthing/config/cert.pem
+            subPath: cert.pem
+            readOnly: true
           - name: sync-keys
             mountPath: /var/syncthing/config/key.pem
             readOnly: true
@@ -19,3 +19,6 @@ spec:
       - name: sync-keys
         secret:
           secretName: sync-secret
+          items:
+            - key: cert.pem
+            - key: key.pem

From 8c9c371f85c28010ff8aa161e243717a58bf4514 Mon Sep 17 00:00:00 2001
From: David Landry <david@dmwl.net>
Date: Sat, 25 May 2024 15:03:58 -0400
Subject: [PATCH 2/2] chore(syncthing): fix patch tree structure

---
 .../overlays/media/deployment-patch.yaml      | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/apps/syncthing/overlays/media/deployment-patch.yaml b/apps/syncthing/overlays/media/deployment-patch.yaml
index 18471c0..a560f02 100644
--- a/apps/syncthing/overlays/media/deployment-patch.yaml
+++ b/apps/syncthing/overlays/media/deployment-patch.yaml
@@ -4,21 +4,22 @@ metadata:
   name: syncthing
 spec:
   template:
-    containers:
-      - name: syncthing
-        volumeMounts:
-          - name: sync-keys
-            mountPath: /var/syncthing/config/cert.pem
-            subPath: cert.pem
-            readOnly: true
-          - name: sync-keys
-            mountPath: /var/syncthing/config/key.pem
-            readOnly: true
-            subPath: key.pem
-    volumes:
-      - name: sync-keys
-        secret:
-          secretName: sync-secret
-          items:
-            - key: cert.pem
-            - key: key.pem
+    spec:
+      containers:
+        - name: syncthing
+          volumeMounts:
+            - name: sync-keys
+              mountPath: /var/syncthing/config/cert.pem
+              subPath: cert.pem
+              readOnly: true
+            - name: sync-keys
+              mountPath: /var/syncthing/config/key.pem
+              readOnly: true
+              subPath: key.pem
+      volumes:
+        - name: sync-keys
+          secret:
+            secretName: sync-secret
+            items:
+              - key: cert.pem
+              - key: key.pem