From 6cc528ba5ad784348efedd3de07e16057214cc08 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 18 Oct 2018 14:49:21 +0300
Subject: [PATCH] Upgrade Synapse (v0.33.5.1 -> v0.33.7rc2)

We skipped v0.33.6 because of matrix-org/synapse#4014,
but v0.33.7rc2 fixed the problem.
---
 roles/matrix-server/defaults/main.yml                        | 2 +-
 roles/matrix-server/templates/synapse/homeserver.yaml.j2     | 1 -
 .../templates/usr-local-bin/matrix-synapse-register-user.j2  | 5 ++---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/roles/matrix-server/defaults/main.yml b/roles/matrix-server/defaults/main.yml
index 897d1360d..5fcaa2dd7 100644
--- a/roles/matrix-server/defaults/main.yml
+++ b/roles/matrix-server/defaults/main.yml
@@ -134,7 +134,7 @@ matrix_docker_image_postgres_v9: "postgres:9.6.10-alpine"
 matrix_docker_image_postgres_v10: "postgres:10.5-alpine"
 matrix_docker_image_postgres_latest: "{{ matrix_docker_image_postgres_v10 }}"
 
-matrix_docker_image_synapse: "matrixdotorg/synapse:v0.33.5.1"
+matrix_docker_image_synapse: "matrixdotorg/synapse:v0.33.7rc2"
 matrix_docker_image_nginx: "nginx:1.15.5-alpine"
 matrix_docker_image_riot: "avhost/docker-matrix-riot:v0.16.4"
 matrix_docker_image_goofys: "cloudproto/goofys:latest"
diff --git a/roles/matrix-server/templates/synapse/homeserver.yaml.j2 b/roles/matrix-server/templates/synapse/homeserver.yaml.j2
index db0997146..e70b30465 100644
--- a/roles/matrix-server/templates/synapse/homeserver.yaml.j2
+++ b/roles/matrix-server/templates/synapse/homeserver.yaml.j2
@@ -590,7 +590,6 @@ email:
    require_transport_security: false
    notif_from: "Matrix <{{ matrix_mailer_sender_address }}>"
    app_name: Matrix
-   template_dir: /synapse/res/templates
    notif_template_html: notif_mail.html
    notif_template_text: notif_mail.txt
    notif_for_new_users: True
diff --git a/roles/matrix-server/templates/usr-local-bin/matrix-synapse-register-user.j2 b/roles/matrix-server/templates/usr-local-bin/matrix-synapse-register-user.j2
index da39cca01..d47addb60 100644
--- a/roles/matrix-server/templates/usr-local-bin/matrix-synapse-register-user.j2
+++ b/roles/matrix-server/templates/usr-local-bin/matrix-synapse-register-user.j2
@@ -10,8 +10,7 @@ password=$2
 admin=$3
 
 if [ "$admin" -eq "1" ]; then
-        docker exec matrix-synapse register_new_matrix_user -a -u $user -p $password -c /data/homeserver.yaml http://localhost:8008
+        docker exec matrix-synapse register_new_matrix_user -u $user -p $password -c /data/homeserver.yaml --admin http://localhost:8008
 else
-        # If `-a` is not passed, we need to answer to an "admin: yes/no" question
-        echo 'no' | docker exec -i matrix-synapse register_new_matrix_user -u $user -p $password $extraFlags -c /data/homeserver.yaml http://localhost:8008
+        docker exec matrix-synapse register_new_matrix_user -u $user -p $password -c /data/homeserver.yaml --no-admin http://localhost:8008
 fi
\ No newline at end of file