From 0d0ef56bcee5bf9c8a3ab164b9aa88439f49d331 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 31 Oct 2016 13:06:46 +0100 Subject: [PATCH] Update server.yaml.tmpl --- rootfs/etc/confd/templates/server.yaml.tmpl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rootfs/etc/confd/templates/server.yaml.tmpl b/rootfs/etc/confd/templates/server.yaml.tmpl index 8f0101c..96c9eec 100644 --- a/rootfs/etc/confd/templates/server.yaml.tmpl +++ b/rootfs/etc/confd/templates/server.yaml.tmpl @@ -1,5 +1,5 @@ -tls_certificate_path: "/etc/ssl/synapse/fullchain.pem" -tls_private_key_path: "/etc/ssl/synapse/privkey.pem" +tls_certificate_path: "/etc/ssl/synapse/{{getenv "CERT_NAME" "fullchain.pem"}}" +tls_private_key_path: "/etc/ssl/synapse/{{getenv "KEY_NAME" "privkey.pem"}}" tls_dh_params_path: "/var/lib/synapse/signing/dhparams.pem" no_tls: False @@ -67,9 +67,9 @@ federation_rc_concurrent: 3 media_store_path: "/var/lib/synapse/media_store" uploads_path: "/var/lib/synapse/uploads" -max_upload_size: "{{getenv "MAX_UPLOAD_SIZE"}}" -max_image_pixels: "{{getenv "MAX_THUMBNAIL_PIXELS"}}" -dynamic_thumbnails: {{getenv "DYNAMIC_THUMBNAILS"}} +max_upload_size: "{{getenv "MAX_UPLOAD_SIZE" "10M"}}" +max_image_pixels: "{{getenv "MAX_THUMBNAIL_PIXELS" "32M"}}" +dynamic_thumbnails: {{getenv "DYNAMIC_THUMBNAILS" "True"}} thumbnail_sizes: - width: 32 @@ -95,7 +95,7 @@ registration_shared_secret: "{{getenv "SHARED_SECRET"}}" turn_uris: [{{getenv "TURN_URIS"}}] turn_shared_secret: "{{getenv "TURN_SHARED_SECRET"}}" -turn_user_lifetime: {{getenv "TURN_USER_LIFETIME"}} +turn_user_lifetime: {{getenv "TURN_USER_LIFETIME" "1h"}} enable_registration: False allow_guest_access: False @@ -104,8 +104,8 @@ trusted_third_party_id_servers: - matrix.org - vector.im -enable_metrics: {{getenv "ENABLE_METRICS"}} -report_stats: {{getenv "REPORT_STATS"}} +enable_metrics: no +report_stats: {{getenv "REPORT_STATS" "no"}} room_invite_state_types: - "m.room.join_rules"