From fc3386dff73646ddd6806a3994157ef184f14e86 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Fri, 11 Aug 2017 08:21:34 +0300 Subject: [PATCH] Fix matrix-synapse-register-user for when the non-admin case It was trying to omit the `-a` flag, but that wasn't enough, because the underlying `register_new_matrix_user` command prompts interactively if it doesn't see the `-a` flag (it doesn't default to non-admin). We need to answer such interactive prompts. --- .../usr-local-bin/matrix-synapse-register-user.j2 | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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 50341320..43e7d8d0 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 @@ -9,10 +9,9 @@ user=$1 password=$2 admin=$3 -extraFlags="" - if [ "$admin" -eq "1" ]; then - extraFlags=$extraFlags" -a" -fi - -docker exec matrix-synapse register_new_matrix_user -u $user -p $password $extraFlags -c /data/homeserver.yaml https://localhost:8448 \ No newline at end of file + docker exec matrix-synapse register_new_matrix_user -a -u $user -p $password -c /data/homeserver.yaml https://localhost:8448 +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 https://localhost:8448 +fi \ No newline at end of file