From 8077e910f648078da2eb0e6b1d8733165775265d Mon Sep 17 00:00:00 2001 From: AlexPewMaster Date: Sat, 13 Jul 2024 22:59:07 +0200 Subject: [PATCH] Fix CONDUWUIT_CONFIG variable in docker-compose.yml files (+ remove deprecated compose version) --- docs/deploying/docker-compose.for-traefik.yml | 3 +-- docs/deploying/docker-compose.override.yml | 1 - docs/deploying/docker-compose.with-caddy.yml | 2 +- docs/deploying/docker-compose.with-traefik.yml | 4 +--- docs/deploying/docker-compose.yml | 4 +--- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/docs/deploying/docker-compose.for-traefik.yml b/docs/deploying/docker-compose.for-traefik.yml index ec3e720c..d10e5815 100644 --- a/docs/deploying/docker-compose.for-traefik.yml +++ b/docs/deploying/docker-compose.for-traefik.yml @@ -1,5 +1,4 @@ # conduwuit - Behind Traefik Reverse Proxy -version: '2.4' # uses '2.4' for cpuset services: homeserver: @@ -24,7 +23,7 @@ services: CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]' #CONDUWUIT_LOG: warn,state_res=warn CONDUWUIT_ADDRESS: 0.0.0.0 - #CONDUWUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above + #CONDUWUIT_CONFIG: '/etc/conduwuit.toml' # Uncomment if you mapped config toml above #cpuset: "0-4" # Uncomment to limit to specific CPU cores # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container diff --git a/docs/deploying/docker-compose.override.yml b/docs/deploying/docker-compose.override.yml index 2e937e75..23d6a90b 100644 --- a/docs/deploying/docker-compose.override.yml +++ b/docs/deploying/docker-compose.override.yml @@ -1,5 +1,4 @@ # conduwuit - Traefik Reverse Proxy Labels -version: '2.4' # uses '2.4' for cpuset services: homeserver: diff --git a/docs/deploying/docker-compose.with-caddy.yml b/docs/deploying/docker-compose.with-caddy.yml index 41d8856d..899f4d67 100644 --- a/docs/deploying/docker-compose.with-caddy.yml +++ b/docs/deploying/docker-compose.with-caddy.yml @@ -39,7 +39,7 @@ services: CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]' #CONDUWUIT_LOG: warn,state_res=warn CONDUWUIT_ADDRESS: 0.0.0.0 - #CONDUWUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above + #CONDUWUIT_CONFIG: '/etc/conduwuit.toml' # Uncomment if you mapped config toml above networks: - caddy labels: diff --git a/docs/deploying/docker-compose.with-traefik.yml b/docs/deploying/docker-compose.with-traefik.yml index c93f5414..79d20051 100644 --- a/docs/deploying/docker-compose.with-traefik.yml +++ b/docs/deploying/docker-compose.with-traefik.yml @@ -1,5 +1,4 @@ # conduwuit - Behind Traefik Reverse Proxy -version: '2.4' # uses '2.4' for cpuset services: homeserver: @@ -16,7 +15,7 @@ services: CONDUWUIT_SERVER_NAME: your.server.name # EDIT THIS CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]' CONDUWUIT_ALLOW_REGISTRATION : 'true' - #CONDUWUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above + #CONDUWUIT_CONFIG: '/etc/conduwuit.toml' # Uncomment if you mapped config toml above ### Uncomment and change values as desired # CONDUWUIT_ADDRESS: 0.0.0.0 # CONDUWUIT_PORT: 6167 @@ -28,7 +27,6 @@ services: # CONDUWUIT_DATABASE_PATH: /srv/conduwuit/.local/share/conduwuit # CONDUWUIT_WORKERS: 10 # CONDUWUIT_MAX_REQUEST_SIZE: 20000000 # in bytes, ~20 MB - #cpuset: "0-4" # Uncomment to limit to specific CPU cores # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container # to serve those two as static files. If you want to use a different way, delete or comment the below service, here diff --git a/docs/deploying/docker-compose.yml b/docs/deploying/docker-compose.yml index 066c8fe1..bc9f2477 100644 --- a/docs/deploying/docker-compose.yml +++ b/docs/deploying/docker-compose.yml @@ -1,5 +1,4 @@ # conduwuit -version: '2.4' # uses '2.4' for cpuset services: homeserver: @@ -24,8 +23,7 @@ services: CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]' #CONDUWUIT_LOG: warn,state_res=warn CONDUWUIT_ADDRESS: 0.0.0.0 - #CONDUWUIT_CONFIG: './conduwuit.toml' # Uncomment if you mapped config toml above - #cpuset: "0-4" # Uncomment to limit to specific CPU cores + #CONDUWUIT_CONFIG: '/etc/conduwuit.toml' # Uncomment if you mapped config toml above # ### Uncomment if you want to use your own Element-Web App. ### Note: You need to provide a config.json for Element and you also need a second