From a812b1c6c78bad9eac7d23c5bca6c076dca8b6ec Mon Sep 17 00:00:00 2001
From: Matthias <m@bits.at>
Date: Fri, 24 May 2019 12:26:51 +0200
Subject: [PATCH] Update to v0.99.5.1

---
 CHANGELOG             |  3 +++
 CloudronManifest.json | 14 ++++++++------
 Dockerfile            |  3 ++-
 start_matrix.sh       |  6 +++---
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5ed071d..b231eaf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+[0.2.1]
+* Update to synapse v0.99.5.1
+
 [0.2.0]
 * Update to synapse v0.99.4
 
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 53fe9e7..5fb8629 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,20 +5,22 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "standalone matrix server",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "memoryLimit": 536870912,
+  "udpPorts": {
+     "TURN_TLS_PORT": {
+       "title": "Default TURN Port",
+       "description": "Default TURN Port (udp)",
+       "defaultValue": 3478
+     }
+  },
   "tcpPorts": {
      "FEDERATION_PORT": {
        "title": "Federation Port",
        "description": "Federation Port",
        "defaultValue": 8448
-     },
-     "TURN_TLS_PORT": {
-       "title": "TURN TLS port",
-       "description": "TURN TLS listening port for Voip",
-       "defaultValue": 5349
      }
   },
   "addons": {
diff --git a/Dockerfile b/Dockerfile
index 78b42ac..a201180 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,7 @@ RUN mkdir -p /app/code/nginx
 WORKDIR /app/code
 
 EXPOSE 8000
+EXPOSE 3478/udp
 
 # nginx
 RUN rm /etc/nginx/sites-enabled/*
@@ -31,7 +32,7 @@ RUN apt-get install -y build-essential python2.7-dev libffi-dev libldap2-dev lib
 RUN pip install --upgrade pip
 RUN pip install --upgrade setuptools
 RUN pip install psycopg2-binary py-bcrypt python-ldap matrix-synapse-ldap3 lxml netaddr twisted jinja2
-RUN pip install https://github.com/matrix-org/synapse/archive/v0.99.4.tar.gz
+RUN pip install https://github.com/matrix-org/synapse/archive/v0.99.5.1.tar.gz
 #https://github.com/matrix-org/synapse/tarball/master
 
 # copy index.html
diff --git a/start_matrix.sh b/start_matrix.sh
index fffa8f7..25c8758 100755
--- a/start_matrix.sh
+++ b/start_matrix.sh
@@ -79,8 +79,8 @@ if [[ ! -d /app/data/synapse ]]; then
     sed -i "s/#use-auth-secret/use-auth-secret/" /app/data/turnserver.conf
     sed -i "s/#lt-cred-mech/lt-cred-mech/" /app/data/turnserver.conf
     sed -i "s/#static-auth-secret=.*/static-auth-secret=${TURNPWD}/" /app/data/turnserver.conf
-    sed -i "s/turn_uris: .*/turn_uris: [\"turn:${APP_DOMAIN}:${TURN_TLS_PORT}?transport=udp\", \"turn:${APP_DOMAIN}:${TURN_TLS_PORT}?transport=tcp\"]/" homeserver.yaml
-    sed -i "s/turn_shared_secret: .*/turn_shared_secret: \"${TURNPWD}\"/" homeserver.yaml
+    sed -i "s/#turn_uris: .*/turn_uris: [\"turn:${APP_DOMAIN}:${TURN_TLS_PORT}?transport=udp\", \"turn:${APP_DOMAIN}:${TURN_TLS_PORT}?transport=tcp\"]/" homeserver.yaml
+    sed -i "s/#turn_shared_secret: .*/turn_shared_secret: \"${TURNPWD}\"/" homeserver.yaml
     sed -i "s/#cipher-list=.*/cipher-list=\"HIGH\"/" /app/data/turnserver.conf
     sed -i "s/#log-file=.*/log-file=\/run\/turn_log\/turn.log/" /app/data/turnserver.conf
 
@@ -91,7 +91,7 @@ if [[ ! -d /app/data/synapse ]]; then
     TLS_DH=$(ls *.tls.dh)
     sed -i "s,#cert=.*,cert=/app/data/synapse/${TLS_CRT}," /app/data/turnserver.conf
     sed -i "s,#pkey=.*,pkey=/app/data/synapse/${TLS_KEY}," /app/data/turnserver.conf
-    sed -i "s,#dh-file=.*,dh-file=/app/data/synapse/${TLS_DH}," /app/data/turnserver.conf
+    #sed -i "s,#dh-file=.*,dh-file=/app/data/synapse/${TLS_DH}," /app/data/turnserver.conf
 
     # set up email
     sed -i 's/#email:/email:/' homeserver.yaml