From 0c4ef9cb17b4c070588c86a779af84c198aed6f4 Mon Sep 17 00:00:00 2001
From: server-06u <server-06u@demb.uk>
Date: Mon, 12 Jun 2023 22:28:18 +0000
Subject: [PATCH] docker-compose: took not sensetive data out of compose's
 secrets to bind mounts

---
 docker-compose.yml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ea85f36..2c18dce 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,17 +8,16 @@ services:
       - 2022:2022
     secrets:
       - chatkey
-      - admins  # Not so secret
-      - motd  # Also not a secret
-    command: "/usr/local/bin/ssh-chat --identity /run/secrets/chatkey --admin=/run/secrets/admins --log=/dev/stdout --motd=/run/secrets/motd"
+    command: "/usr/local/bin/ssh-chat --identity /run/secrets/chatkey --admin=/admins --log=/dev/stdout --motd=/motd"
 
   matterbridge:
     build: https://gitea.demb.uk/third-party-mirrors/matterbridge.git#v1.26.0
     image: matterbridge
     restart: unless-stopped
-    secrets:
-      - source: matterbridge-config
-        target: /etc/matterbridge/matterbridge.toml
+    volumes:
+      - ./matterbridge/matterbridge.toml:/etc/matterbridge/matterbridge.toml:ro
+      - ./ssh-chat/motd:/motd:ro
+      - ./ssh-chat/admins:/admins:ro
     environment:
       - MATTERBRIDGE_DISCORD_MYDISCORD_TOKEN  # Expected to be found in ./.env
     depends_on:
@@ -38,13 +37,8 @@ services:
 
 volumes:
   ts3-vol:
+    external: true
 
 secrets:
   chatkey:
     file: ./id_ed25516
-  admins:
-    file: ./ssh-chat/admins
-  motd:
-    file: ./ssh-chat/motd
-  matterbridge-config:
-    file: ./matterbridge/matterbridge.toml