From e140e1c0c902445b3cd60c28f8ef5b205438d554 Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Sun, 6 Jan 2019 16:31:51 +0100
Subject: [PATCH] update no tls

---
 rootfs/etc/confd/templates/server.yaml.tmpl | 22 +--------------------
 rootfs/etc/cont-init.d/synapse-keys         |  4 ----
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/rootfs/etc/confd/templates/server.yaml.tmpl b/rootfs/etc/confd/templates/server.yaml.tmpl
index dbb894b..12613dd 100644
--- a/rootfs/etc/confd/templates/server.yaml.tmpl
+++ b/rootfs/etc/confd/templates/server.yaml.tmpl
@@ -1,8 +1,6 @@
 tls_certificate_path: "/etc/ssl/matrix-synapse/{{getenv "CERT_DOMAIN"}}.crt"
-tls_private_key_path: "/etc/ssl/matrix-synapse/{{getenv "CERT_DOMAIN"}}.key"
 
-tls_dh_params_path: "/var/lib/matrix-synapse/signing/dhparams.pem"
-no_tls: False
+no_tls: True
 
 server_name: "{{getenv "SERVER_NAME"}}"
 
@@ -14,24 +12,6 @@ public_baseurl: {{getenv "PUBLIC_BASE_URL"}}
 soft_file_limit: 0
 
 listeners:
-  -
-    port: 8448
-    bind_addresses:
-      - '::'
-      - '0.0.0.0'
-    type: http
-    tls: true
-    x_forwarded: false
-    resources:
-      -
-        names:
-          - client
-          - webclient
-        compress: true
-
-      - names: [federation]
-        compress: false
-
   - port: 8008
     tls: false
     bind_addresses:
diff --git a/rootfs/etc/cont-init.d/synapse-keys b/rootfs/etc/cont-init.d/synapse-keys
index 2afa89d..b835538 100644
--- a/rootfs/etc/cont-init.d/synapse-keys
+++ b/rootfs/etc/cont-init.d/synapse-keys
@@ -3,7 +3,3 @@
 if [ ! -f /var/lib/matrix-synapse/signing/signing.key ]; then
     s6-setuidgid matrix-synapse python -B -m synapse.app.homeserver -c /var/lib/matrix-synapse/server.yaml --generate-config -H $SERVER_NAME --report-stats=no
 fi
-
-if [ ! -f /var/lib/matrix-synapse/signing/dhparams.pem ]; then
-    openssl dhparam -out /var/lib/matrix-synapse/signing/dhparams.pem $DHPARAM_LENGTH
-fi