From e7b1951c53cb629a5627fd8054d19ce3210eaaa9 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 7 Feb 2017 13:50:25 +0000
Subject: [PATCH] Re-enable matrix homeserver

---
 src/freedombone-app-matrix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index ce766cae..fcfef847 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -30,10 +30,10 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-VARIANTS=''
+VARIANTS='full full-vim chat'
 
 IN_DEFAULT_INSTALL=0
-SHOW_ON_ABOUT=0
+SHOW_ON_ABOUT=1
 
 MATRIX_DATA_DIR='/var/lib/matrix'
 MATRIX_HTTP_PORT=8558
@@ -43,9 +43,9 @@ MATRIX_ID_PORT=8081
 MATRIX_ONION_PORT=8109
 MATRIX_ID_ONION_PORT=8111
 MATRIX_REPO="https://github.com/matrix-org/synapse"
-MATRIX_COMMIT='f5a4001bb116c468cc5e8e0ae04a1c570e2cb171'
+MATRIX_COMMIT='fad3a8433535d7de321350bbd17373138c6fd3ec'
 SYDENT_REPO="https://github.com/matrix-org/sydent"
-SYDENT_COMMIT='99edbd4c80c42b76e26f696054fcbbceecb25d5f'
+SYDENT_COMMIT='81231b93e2e987445ad232b0a8216de33c1eba6d'
 REPORT_STATS="no"
 MATRIX_SECRET=
 
@@ -333,7 +333,7 @@ function upgrade_matrix {
     cd /etc/sydent
     pip install --upgrade --process-dependency-links .
 
-    sed -i 's/ssl.PROTOCOL_SSLv23/ssl.PROTOCOL_TLSv1/g' /usr/local/bin/register_new_matrix_user
+    #sed -i 's/ssl.PROTOCOL_SSLv23/ssl.PROTOCOL_TLSv1/g' /usr/local/bin/register_new_matrix_user
 
     chown -R matrix:matrix /etc/matrix
     chown -R matrix:matrix /etc/sydent