|
@@ -312,22 +312,16 @@ function remove_user_matrix {
|
312
|
312
|
function add_user_matrix {
|
313
|
313
|
new_username="$1"
|
314
|
314
|
new_user_password="$2"
|
315
|
|
- is_admin_user='-a'
|
316
|
315
|
|
317
|
316
|
read_config_param MY_USERNAME
|
318
|
|
- read_config_param ONION_ONLY
|
319
|
317
|
read_config_param MATRIX_DOMAIN_NAME
|
320
|
318
|
|
321
|
|
- if [[ "$new_username" != "$MY_USERNAME" ]]; then
|
322
|
|
- is_admin_user=''
|
323
|
|
- fi
|
324
|
|
-
|
325
|
319
|
${PROJECT_NAME}-pass -u $new_username -a matrix -p "$new_user_password"
|
326
|
320
|
|
327
|
|
- if [[ $ONION_ONLY == 'no' ]]; then
|
328
|
|
- register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml -u "${new_username}" -p "${new_user_password}" $is_admin_user https://${MATRIX_DOMAIN_NAME}
|
|
321
|
+ if [[ "$new_username" != "$MY_USERNAME" ]]; then
|
|
322
|
+ echo 'no' | register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml -u "${new_username}" -p "${new_user_password}" http://localhost:${MATRIX_PORT}
|
329
|
323
|
else
|
330
|
|
- register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml -u "${new_username}" -p "${new_user_password}" $is_admin_user http://${MATRIX_DOMAIN_NAME}
|
|
324
|
+ echo 'yes' | register_new_matrix_user -c ${MATRIX_DATA_DIR}/homeserver.yaml -u "${new_username}" -p "${new_user_password}" -a http://localhost:${MATRIX_PORT}
|
331
|
325
|
fi
|
332
|
326
|
echo "0"
|
333
|
327
|
}
|