magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix CONDUWUIT_CONFIG variable in docker-compose.yml files (+ remove deprecated compose version)

Browse source
This commit is contained in:
AlexPewMaster 2024-07-13 22:59:07 +02:00 • committed by June 🍓🦴
parent b5d4a1c1b0
commit 8077e910f6
5 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/deploying/docker-compose.for-traefik.yml
View file

@ -1,5 +1,4 @@
# conduwuit - Behind Traefik Reverse Proxy # conduwuit - Behind Traefik Reverse Proxy
version: '2.4' # uses '2.4' for cpuset
services: services:
homeserver: homeserver:
@ -24,7 +23,7 @@ services:
CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]' CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]'
#CONDUWUIT_LOG: warn,state_res=warn #CONDUWUIT_LOG: warn,state_res=warn
CONDUWUIT_ADDRESS: 0.0.0.0 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 #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 # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container

1
docs/deploying/docker-compose.override.yml
View file

@ -1,5 +1,4 @@
# conduwuit - Traefik Reverse Proxy Labels # conduwuit - Traefik Reverse Proxy Labels
version: '2.4' # uses '2.4' for cpuset
services: services:
homeserver: homeserver:

2
docs/deploying/docker-compose.with-caddy.yml
View file

@ -39,7 +39,7 @@ services:
CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]' CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]'
#CONDUWUIT_LOG: warn,state_res=warn #CONDUWUIT_LOG: warn,state_res=warn
CONDUWUIT_ADDRESS: 0.0.0.0 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: networks:
- caddy - caddy
labels: labels:

4
docs/deploying/docker-compose.with-traefik.yml
View file

@ -1,5 +1,4 @@
# conduwuit - Behind Traefik Reverse Proxy # conduwuit - Behind Traefik Reverse Proxy
version: '2.4' # uses '2.4' for cpuset
services: services:
homeserver: homeserver:
@ -16,7 +15,7 @@ services:
CONDUWUIT_SERVER_NAME: your.server.name # EDIT THIS CONDUWUIT_SERVER_NAME: your.server.name # EDIT THIS
CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]' CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]'
CONDUWUIT_ALLOW_REGISTRATION : 'true' 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 ### Uncomment and change values as desired
# CONDUWUIT_ADDRESS: 0.0.0.0 # CONDUWUIT_ADDRESS: 0.0.0.0
# CONDUWUIT_PORT: 6167 # CONDUWUIT_PORT: 6167
@ -28,7 +27,6 @@ services:
# CONDUWUIT_DATABASE_PATH: /srv/conduwuit/.local/share/conduwuit # CONDUWUIT_DATABASE_PATH: /srv/conduwuit/.local/share/conduwuit
# CONDUWUIT_WORKERS: 10 # CONDUWUIT_WORKERS: 10
# CONDUWUIT_MAX_REQUEST_SIZE: 20000000 # in bytes, ~20 MB # 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 # 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 # to serve those two as static files. If you want to use a different way, delete or comment the below service, here

4
docs/deploying/docker-compose.yml
View file

@ -1,5 +1,4 @@
# conduwuit # conduwuit
version: '2.4' # uses '2.4' for cpuset
services: services:
homeserver: homeserver:
@ -24,8 +23,7 @@ services:
CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]' CONDUWUIT_TRUSTED_SERVERS: '["matrix.org"]'
#CONDUWUIT_LOG: warn,state_res=warn #CONDUWUIT_LOG: warn,state_res=warn
CONDUWUIT_ADDRESS: 0.0.0.0 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
# #
### Uncomment if you want to use your own Element-Web App. ### 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 ### Note: You need to provide a config.json for Element and you also need a second