matrix-synapse: fix user check
This commit is contained in:
parent
084cd8751f
commit
24b0d72d96
|
@ -73,6 +73,8 @@
|
||||||
machine.wait_for_unit("matrix-synapse")
|
machine.wait_for_unit("matrix-synapse")
|
||||||
machine.succeed("${pkgs.netcat}/bin/nc -z -v ::1 8008")
|
machine.succeed("${pkgs.netcat}/bin/nc -z -v ::1 8008")
|
||||||
machine.succeed("${pkgs.curl}/bin/curl -Ssf -L http://localhost/_matrix/static/ -H 'Host: matrix.clan.test'")
|
machine.succeed("${pkgs.curl}/bin/curl -Ssf -L http://localhost/_matrix/static/ -H 'Host: matrix.clan.test'")
|
||||||
|
machine.succeed("${pkgs.curl}/bin/curl -Svf -L -H 'Authorization: Bearer supersecret' http://localhost:8008/_synapse/admin/v1/whois/@admin:clan.test >&2")
|
||||||
|
machine.succeed("${pkgs.curl}/bin/curl -Svf -L -H 'Authorization: Bearer supersecret' http://localhost:8008/_synapse/admin/v1/whois/@someuser:clan.test >&2")
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
|
@ -187,7 +187,8 @@ in
|
||||||
''
|
''
|
||||||
+ lib.concatMapStringsSep "\n" (user: ''
|
+ lib.concatMapStringsSep "\n" (user: ''
|
||||||
# only create user if it doesn't exist
|
# only create user if it doesn't exist
|
||||||
if ! curl --header "$headers" "http://localhost:8008/_synapse/admin/v1/whois/${user.name}@${cfg.domain}" >&2; then
|
set -x
|
||||||
|
if ! curl --silent --header "@$headers" "http://localhost:8008/_synapse/admin/v1/whois/@${user.name}:${cfg.domain}" >&2; then
|
||||||
/run/current-system/sw/bin/matrix-synapse-register_new_matrix_user --password-file ${
|
/run/current-system/sw/bin/matrix-synapse-register_new_matrix_user --password-file ${
|
||||||
config.clanCore.facts.services."matrix-password-${user.name}".secret."matrix-password-${user.name}".path
|
config.clanCore.facts.services."matrix-password-${user.name}".secret."matrix-password-${user.name}".path
|
||||||
} --user "${user.name}" ${if user.admin then "--admin" else "--no-admin"}
|
} --user "${user.name}" ${if user.admin then "--admin" else "--no-admin"}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user