summary refs log tree commit diff
path: root/contrib/docker/conf
diff options
context:
space:
mode:
authorkaiyou <pierre@jaury.eu>2018-02-05 23:13:27 +0100
committerkaiyou <pierre@jaury.eu>2018-02-05 23:13:27 +0100
commit1ffd9cb93617fe9bb2367d575786c0ff222cd415 (patch)
tree2eca3113f264d71c0849741d29a1beb70e1cbd0f /contrib/docker/conf
parentAdd the non-tls port to the expose list (diff)
downloadsynapse-1ffd9cb93617fe9bb2367d575786c0ff222cd415.tar.xz
Support loading application service files from /data/appservices/
Diffstat (limited to 'contrib/docker/conf')
-rw-r--r--contrib/docker/conf/homeserver.yaml9
1 files changed, 8 insertions, 1 deletions
diff --git a/contrib/docker/conf/homeserver.yaml b/contrib/docker/conf/homeserver.yaml
index 6f8fb24e5f..e5d3f965e4 100644
--- a/contrib/docker/conf/homeserver.yaml
+++ b/contrib/docker/conf/homeserver.yaml
@@ -128,7 +128,7 @@ recaptcha_siteverify_api: "https://www.google.com/recaptcha/api/siteverify"
 
 {% if SYNAPSE_TURN_URIS %}
 turn_uris:
-{% for uri in SYNAPSE_TURN_URIS.split(',') %}  - {{ uri }}
+{% for uri in SYNAPSE_TURN_URIS.split(',') %}    - "{{ uri }}"
 {% endfor %}
 turn_shared_secret: "{{ SYNAPSE_TURN_SECRET }}"
 turn_user_lifetime: "1h"
@@ -167,7 +167,14 @@ room_invite_state_types:
     - "m.room.avatar"
     - "m.room.name"
 
+{% if SYNAPSE_APPSERVICES %}
+app_service_config_files:
+{% for appservice in SYNAPSE_APPSERVICES %}    - "{{ appservice }}"
+{% endfor %}
+{% else %}
 app_service_config_files: []
+{% endif %}
+
 macaroon_secret_key: "{{ SYNAPSE_MACAROON_SECRET_KEY }}"
 expire_access_token: False