From 4303f7e11a231f41eaafb8c1b3f3e9a294206754 Mon Sep 17 00:00:00 2001
From: Trammell Hudson <hudson@trmm.net>
Date: Sat, 3 Dec 2022 16:11:42 +0000
Subject: [PATCH] keycloak: map secrets directory instead of per-service
 mappings

---
 bookwyrm.yaml  | 2 --
 gitea.yaml     | 1 -
 grafana.yaml   | 1 -
 hedgedoc.yaml  | 1 -
 keycloak.yaml  | 2 +-
 mastodon.yaml  | 1 -
 matrix.yaml    | 1 -
 mobilizon.yaml | 1 -
 nextcloud.yaml | 1 -
 pixelfed.yaml  | 1 -
 secrets/README | 1 +
 11 files changed, 2 insertions(+), 11 deletions(-)
 create mode 100644 secrets/README

diff --git a/bookwyrm.yaml b/bookwyrm.yaml
index a2dbb94..004d5ee 100644
--- a/bookwyrm.yaml
+++ b/bookwyrm.yaml
@@ -140,5 +140,3 @@ services:
   keycloak:
     volumes:
       - ./bookwyrm/keycloak.sh:/keycloak-setup/bookwyrm.sh:ro
-      - ./data/bookwyrm/secrets:/run/secrets/bookwyrm:ro
-
diff --git a/gitea.yaml b/gitea.yaml
index d7763b6..40672b1 100644
--- a/gitea.yaml
+++ b/gitea.yaml
@@ -71,5 +71,4 @@ services:
   # add the gitea client secrets to the keycloak-setup volume
   keycloak:
     volumes:
-      - ./data/gitea/secrets:/run/secrets/gitea:ro
       - ./gitea/keycloak.sh:/keycloak-setup/gitea.sh:ro
diff --git a/grafana.yaml b/grafana.yaml
index eefab2c..37796ab 100644
--- a/grafana.yaml
+++ b/grafana.yaml
@@ -39,4 +39,3 @@ services:
   keycloak:
     volumes:
       - ./grafana/keycloak.sh:/keycloak-setup/grafana.sh:ro
-      - ./data/grafana/secrets:/run/secrets/grafana:ro
diff --git a/hedgedoc.yaml b/hedgedoc.yaml
index 57db592..4fcd15a 100644
--- a/hedgedoc.yaml
+++ b/hedgedoc.yaml
@@ -54,4 +54,3 @@ services:
   keycloak:
     volumes:
       - ./hedgedoc/keycloak.sh:/keycloak-setup/hedgedoc.sh:ro
-      - ./data/hedgedoc/secrets:/run/secrets/hedgedoc:ro
diff --git a/keycloak.yaml b/keycloak.yaml
index d34f3b0..b75990e 100644
--- a/keycloak.yaml
+++ b/keycloak.yaml
@@ -45,7 +45,7 @@ services:
         - ./keycloak/entrypoint-setup.sh:/setup.sh:ro
         - ./keycloak/mail-setup.sh:/keycloak-setup/mail-setup.sh:ro
         - ./keycloak/mapper-setup.sh:/keycloak-setup/mapper-setup.sh:ro
-        - ./data/keycloak/secrets:/run/secrets/keycloak-secrets:ro
+        - ./secrets:/run/secrets:ro
       depends_on:
         - keycloak-db
 
diff --git a/mastodon.yaml b/mastodon.yaml
index 447c37d..c8f1397 100644
--- a/mastodon.yaml
+++ b/mastodon.yaml
@@ -203,7 +203,6 @@ services:
   keycloak:
     volumes:
       - ./mastodon/keycloak.sh:/keycloak-setup/mastodon.sh:ro
-      - ./data/mastodon/secrets:/run/secrets/mastodon:ro
 
 #networks:
 #  external_network:
diff --git a/matrix.yaml b/matrix.yaml
index b017563..8c86e08 100644
--- a/matrix.yaml
+++ b/matrix.yaml
@@ -52,4 +52,3 @@ services:
   keycloak:
     volumes:
       - ./matrix/keycloak.sh:/keycloak-setup/matrix.sh:ro
-      - ./data/matrix/secrets:/run/secrets/matrix:ro
diff --git a/mobilizon.yaml b/mobilizon.yaml
index 89b8ecc..9b8ed8f 100644
--- a/mobilizon.yaml
+++ b/mobilizon.yaml
@@ -59,4 +59,3 @@ services:
   keycloak:
     volumes:
       - ./mobilizon/keycloak.sh:/keycloak-setup/mobilizon.sh:ro
-      - ./data/mobilizon/secrets:/run/secrets/mobilizon:ro
diff --git a/nextcloud.yaml b/nextcloud.yaml
index f21301d..54b31c6 100644
--- a/nextcloud.yaml
+++ b/nextcloud.yaml
@@ -44,4 +44,3 @@ services:
   keycloak:
     volumes:
       - ./nextcloud/keycloak.sh:/keycloak-setup/nextcloud.sh:ro
-      - ./data/nextcloud/secrets:/run/secrets/nextcloud:ro
diff --git a/pixelfed.yaml b/pixelfed.yaml
index 48e60ad..f60140e 100644
--- a/pixelfed.yaml
+++ b/pixelfed.yaml
@@ -87,4 +87,3 @@ services:
   keycloak:
     volumes:
       - ./pixelfed/keycloak.sh:/keycloak-setup/pixelfed.sh:ro
-      - ./secrets/pixelfed:/run/secrets/pixelfed:ro
diff --git a/secrets/README b/secrets/README
new file mode 100644
index 0000000..07aa174
--- /dev/null
+++ b/secrets/README
@@ -0,0 +1 @@
+# Do not check in anything in this directory