diff options
| author | purplemeteorite <purplemeteorite@protonmail.com> | 2023-07-29 08:02:56 +0000 |
|---|---|---|
| committer | purplemeteorite <purplemeteorite@protonmail.com> | 2023-07-29 08:02:56 +0000 |
| commit | c0a2acb869ec25898ccbce8e70d94d6274ada4d9 (patch) | |
| tree | 6abfe0d8a7826772c41046bcfe1f95af669c6d39 | |
| parent | 081cc66edac5b1a2a6af92e4b735ea02b1848c39 (diff) | |
| parent | 97835541ce323ec06b68e2e46886d80cb29c7f24 (diff) | |
| download | conduit-c0a2acb869ec25898ccbce8e70d94d6274ada4d9.zip | |
Merge branch 'next' into 'fix-broken-links'
# Conflicts resolved:
# docker/README.md
| -rw-r--r-- | docker/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/README.md b/docker/README.md index 43f2996..8aa4198 100644 --- a/docker/README.md +++ b/docker/README.md @@ -129,7 +129,7 @@ With the service `well-known` we use a single `nginx` container that will serve So...step by step: 1. Copy [`docker-compose.for-traefik.yml`](docker-compose.for-traefik.yml) (or -[`docker-compose.with-traefik.yml`](docker-compose.with-traefik.yml)) and [`docker-compose.override.traefik.yml`](docker-compose.override.yml) from the repository and remove `.traefik` from the filenames. +[`docker-compose.with-traefik.yml`](docker-compose.with-traefik.yml)) and [`docker-compose.override.yml`](docker-compose.override.yml) from the repository and remove `.for-traefik` (or `.with-traefik`) from the filename. 2. Open both files and modify/adjust them to your needs. Meaning, change the `CONDUIT_SERVER_NAME` and the volume host mappings according to your needs. 3. Create the `conduit.toml` config file, an example can be found [here](../conduit-example.toml), or set `CONDUIT_CONFIG=""` and configure Conduit per env vars. 4. Uncomment the `element-web` service if you want to host your own Element Web Client and create a `element_config.json`. |