Merge branch 'master' into 'master'

Fix docker-compose trusted_servers env var See merge request famedly/conduit!87
3 years ago · d1c0eaf628
parent 1aec80c57c 8387ceacab
commit d1c0eaf628
2 changed files with 2 additions and 4 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -26,8 +26,7 @@ services:
            # - ./conduit.toml:/srv/conduit/conduit.toml
        environment:
            CONDUIT_SERVER_NAME: localhost:8000  # replace with your own name
-            CONDUIT_TRUSTED_SERVERS:
-                - 'matrix.org'
+            CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
            ### Uncomment and change values as desired
            # CONDUIT_ADDRESS: 127.0.0.1
            # CONDUIT_PORT: 8000
--- a/docker/docker-compose.traefik.yml
+++ b/docker/docker-compose.traefik.yml
@ -26,8 +26,7 @@ services:
            - proxy
        environment:
            CONDUIT_SERVER_NAME: localhost:8000  # replace with your own name
-            CONDUIT_TRUSTED_SERVERS:
-                - 'matrix.org'
+            CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
            ### Uncomment and change values as desired
            # CONDUIT_ADDRESS: 127.0.0.1
            # CONDUIT_PORT: 8000