diff --git a/docs/deploying/docker-compose.for-traefik.yml b/docs/deploying/docker-compose.for-traefik.yml index 44f569f8c..b4f52d33e 100644 --- a/docs/deploying/docker-compose.for-traefik.yml +++ b/docs/deploying/docker-compose.for-traefik.yml @@ -2,8 +2,6 @@ services: homeserver: - ### If you already built the continuwuity image with 'docker build' or want to use the Docker Hub image, - ### then you are ready to go. image: forgejo.ellis.link/continuwuation/continuwuity:latest restart: unless-stopped command: /sbin/conduwuit @@ -24,16 +22,8 @@ services: environment: CONTINUWUITY_SERVER_NAME: your.server.name.example # EDIT THIS CONTINUWUITY_DATABASE_PATH: /var/lib/continuwuity - CONTINUWUITY_PORT: 6167 # should match the loadbalancer traefik label - CONTINUWUITY_MAX_REQUEST_SIZE: 20000000 # in bytes, ~20 MB - CONTINUWUITY_ALLOW_REGISTRATION: 'true' - CONTINUWUITY_REGISTRATION_TOKEN: 'YOUR_TOKEN' # A registration token is required when registration is allowed. - #CONTINUWUITY_YES_I_AM_VERY_VERY_SURE_I_WANT_AN_OPEN_REGISTRATION_SERVER_PRONE_TO_ABUSE: 'true' - CONTINUWUITY_ALLOW_FEDERATION: 'true' - CONTINUWUITY_ALLOW_CHECK_FOR_UPDATES: 'true' - CONTINUWUITY_TRUSTED_SERVERS: '["matrix.org"]' - #CONTINUWUITY_LOG: warn,state_res=warn CONTINUWUITY_ADDRESS: 0.0.0.0 + CONTINUWUITY_PORT: 6167 # should match the loadbalancer traefik label #CONTINUWUITY_CONFIG: '/etc/continuwuity.toml' # Uncomment if you mapped config toml above # We need some way to serve the client and server .well-known json. The simplest way is via the CONTINUWUITY_WELL_KNOWN @@ -50,20 +40,6 @@ services: soft: 1048567 hard: 1048567 - ### 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 - ### Domain or Subdomain for the communication between Element and Continuwuity - ### Config-Docs: https://github.com/vector-im/element-web/blob/develop/docs/config.md - # element-web: - # image: vectorim/element-web:latest - # restart: unless-stopped - # volumes: - # - ./element_config.json:/app/config.json - # networks: - # - proxy - # depends_on: - # - homeserver - volumes: db: @@ -72,5 +48,3 @@ networks: # name, don't forget to change it here and in the docker-compose.override.yml proxy: external: true - -# vim: ts=2:sw=2:expandtab diff --git a/docs/deploying/docker-compose.override.yml b/docs/deploying/docker-compose.override.yml index c1a7248ca..1997d3e4d 100644 --- a/docs/deploying/docker-compose.override.yml +++ b/docs/deploying/docker-compose.override.yml @@ -22,15 +22,3 @@ services: #- "traefik.http.routers.to-matrix-wellknown.tls=true" #- "traefik.http.routers.to-matrix-wellknown.tls.certresolver=letsencrypt" #- "traefik.http.routers.to-matrix-wellknown.middlewares=cors-headers@docker" - - ### Uncomment this if you uncommented Element-Web App in the docker-compose.yml - # element-web: - # labels: - # - "traefik.enable=true" - # - "traefik.docker.network=proxy" # Change this to the name of your Traefik docker proxy network - - # - "traefik.http.routers.to-element-web.rule=Host(`.`)" # Change to the address on which Element-Web is hosted - # - "traefik.http.routers.to-element-web.tls=true" - # - "traefik.http.routers.to-element-web.tls.certresolver=letsencrypt" - -# vim: ts=2:sw=2:expandtab diff --git a/docs/deploying/docker-compose.with-caddy.yml b/docs/deploying/docker-compose.with-caddy.yml index 40cd88316..66b7f9dbd 100644 --- a/docs/deploying/docker-compose.with-caddy.yml +++ b/docs/deploying/docker-compose.with-caddy.yml @@ -19,8 +19,6 @@ services: caddy.reverse_proxy: /.well-known/matrix/* homeserver:6167 homeserver: - ### If you already built the Continuwuity image with 'docker build' or want to use a registry image, - ### then you are ready to go. image: forgejo.ellis.link/continuwuation/continuwuity:latest restart: unless-stopped command: /sbin/conduwuit @@ -31,16 +29,8 @@ services: environment: CONTINUWUITY_SERVER_NAME: example.com # EDIT THIS CONTINUWUITY_DATABASE_PATH: /var/lib/continuwuity - CONTINUWUITY_PORT: 6167 - CONTINUWUITY_MAX_REQUEST_SIZE: 20000000 # in bytes, ~20 MB - CONTINUWUITY_ALLOW_REGISTRATION: 'true' - CONTINUWUITY_REGISTRATION_TOKEN: 'YOUR_TOKEN' # A registration token is required when registration is allowed. - #CONTINUWUITY_YES_I_AM_VERY_VERY_SURE_I_WANT_AN_OPEN_REGISTRATION_SERVER_PRONE_TO_ABUSE: 'true' - CONTINUWUITY_ALLOW_FEDERATION: 'true' - CONTINUWUITY_ALLOW_CHECK_FOR_UPDATES: 'true' - CONTINUWUITY_TRUSTED_SERVERS: '["matrix.org"]' - #CONTINUWUITY_LOG: warn,state_res=warn CONTINUWUITY_ADDRESS: 0.0.0.0 + CONTINUWUITY_PORT: 6167 #CONTINUWUITY_CONFIG: '/etc/continuwuity.toml' # Uncomment if you mapped config toml above # Required for .well-known delegation - edit these according to your chosen domain diff --git a/docs/deploying/docker-compose.with-traefik.yml b/docs/deploying/docker-compose.with-traefik.yml index c951f36bb..c4f7b6d78 100644 --- a/docs/deploying/docker-compose.with-traefik.yml +++ b/docs/deploying/docker-compose.with-traefik.yml @@ -2,8 +2,6 @@ services: homeserver: - ### If you already built the Continuwuity image with 'docker build' or want to use the Docker Hub image, - ### then you are ready to go. image: forgejo.ellis.link/continuwuation/continuwuity:latest restart: unless-stopped command: /sbin/conduwuit @@ -23,26 +21,10 @@ services: # - "traefik.http.routers.continuwuity.middlewares=secureHeaders@file" environment: CONTINUWUITY_SERVER_NAME: your.server.name.example # EDIT THIS - CONTINUWUITY_TRUSTED_SERVERS: '["matrix.org"]' - CONTINUWUITY_ALLOW_REGISTRATION: 'false' # After setting a secure registration token, you can enable this - CONTINUWUITY_REGISTRATION_TOKEN: "" # This is a token you can use to register on the server - #CONTINUWUITY_REGISTRATION_TOKEN_FILE: "" # Alternatively you can configure a path to a token file to read + CONTINUWUITY_DATABASE_PATH: /var/lib/continuwuity CONTINUWUITY_ADDRESS: 0.0.0.0 CONTINUWUITY_PORT: 6167 # you need to match this with the traefik load balancer label if you're want to change it - CONTINUWUITY_DATABASE_PATH: /var/lib/continuwuity #CONTINUWUITY_CONFIG: '/etc/continuwuity.toml' # Uncomment if you mapped config toml above - ### Uncomment and change values as desired, note that Continuwuity has plenty of config options, so you should check out the example example config too - # Available levels are: error, warn, info, debug, trace - more info at: https://docs.rs/env_logger/*/env_logger/#enabling-logging - # CONTINUWUITY_LOG: info # default is: "warn,state_res=warn" - # CONTINUWUITY_ALLOW_ENCRYPTION: 'true' - # CONTINUWUITY_ALLOW_FEDERATION: 'true' - # CONTINUWUITY_ALLOW_CHECK_FOR_UPDATES: 'true' - # CONTINUWUITY_ALLOW_INCOMING_PRESENCE: true - # CONTINUWUITY_ALLOW_OUTGOING_PRESENCE: true - # CONTINUWUITY_ALLOW_LOCAL_PRESENCE: true - # CONTINUWUITY_WORKERS: 10 - # CONTINUWUITY_MAX_REQUEST_SIZE: 20000000 # in bytes, ~20 MB - # CONTINUWUITY_NEW_USER_DISPLAYNAME_SUFFIX = "🏳<200d>⚧" # We need some way to serve the client and server .well-known json. The simplest way is via the CONTINUWUITY_WELL_KNOWN # variable / config option, there are multiple ways to do this, e.g. in the continuwuity.toml file, and in a separate @@ -58,20 +40,6 @@ services: soft: 1048567 hard: 1048567 - ### 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 - ### Domain or Subdomain for the communication between Element and Continuwuity - ### Config-Docs: https://github.com/vector-im/element-web/blob/develop/docs/config.md - # element-web: - # image: vectorim/element-web:latest - # restart: unless-stopped - # volumes: - # - ./element_config.json:/app/config.json - # networks: - # - proxy - # depends_on: - # - homeserver - traefik: image: "traefik:latest" container_name: "traefik" @@ -106,7 +74,6 @@ services: TRAEFIK_ENTRYPOINTS_WEBSECURE: true TRAEFIK_ENTRYPOINTS_WEBSECURE_ADDRESS: ":443" TRAEFIK_ENTRYPOINTS_WEBSECURE_HTTP_TLS_CERTRESOLVER: letsencrypt - #TRAEFIK_ENTRYPOINTS_WEBSECURE_HTTP_MIDDLEWARES: secureHeaders@file # if you want to enabled STS TRAEFIK_CERTIFICATESRESOLVERS_LETSENCRYPT: true TRAEFIK_CERTIFICATESRESOLVERS_LETSENCRYPT_ACME_EMAIL: # Set this to the email you want to receive certificate expiration emails for @@ -156,5 +123,3 @@ volumes: networks: proxy: - -# vim: ts=2:sw=2:expandtab diff --git a/docs/deploying/docker-compose.yml b/docs/deploying/docker-compose.yml index a15f9241c..86bdcd2b7 100644 --- a/docs/deploying/docker-compose.yml +++ b/docs/deploying/docker-compose.yml @@ -2,8 +2,6 @@ services: homeserver: - ### If you already built the Continuwuity image with 'docker build' or want to use a registry image, - ### then you are ready to go. image: forgejo.ellis.link/continuwuation/continuwuity:latest restart: unless-stopped command: /sbin/conduwuit @@ -15,31 +13,9 @@ services: environment: CONTINUWUITY_SERVER_NAME: your.server.name # EDIT THIS CONTINUWUITY_DATABASE_PATH: /var/lib/continuwuity - CONTINUWUITY_PORT: 6167 - CONTINUWUITY_MAX_REQUEST_SIZE: 20000000 # in bytes, ~20 MB - CONTINUWUITY_ALLOW_REGISTRATION: 'true' - CONTINUWUITY_REGISTRATION_TOKEN: 'YOUR_TOKEN' # A registration token is required when registration is allowed. - #CONTINUWUITY_YES_I_AM_VERY_VERY_SURE_I_WANT_AN_OPEN_REGISTRATION_SERVER_PRONE_TO_ABUSE: 'true' - CONTINUWUITY_ALLOW_FEDERATION: 'true' - CONTINUWUITY_ALLOW_CHECK_FOR_UPDATES: 'true' - CONTINUWUITY_TRUSTED_SERVERS: '["matrix.org"]' - #CONTINUWUITY_LOG: warn,state_res=warn CONTINUWUITY_ADDRESS: 0.0.0.0 + CONTINUWUITY_PORT: 6167 #CONTINUWUITY_CONFIG: '/etc/continuwuity.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 - ### Domain or Subdomain for the communication between Element and Continuwuity - ### Config-Docs: https://github.com/vector-im/element-web/blob/develop/docs/config.md - # element-web: - # image: vectorim/element-web:latest - # restart: unless-stopped - # ports: - # - 8009:80 - # volumes: - # - ./element_config.json:/app/config.json - # depends_on: - # - homeserver volumes: db: