瀏覽代碼

Adding matrix users

Bob Mottram 7 年之前
父節點
當前提交
8c0afcc08e
共有 1 個檔案被更改,包括 3 行新增9 行删除
  1. 3
    9
      src/freedombone-app-matrix

+ 3
- 9
src/freedombone-app-matrix 查看文件

312
 function add_user_matrix {
312
 function add_user_matrix {
313
     new_username="$1"
313
     new_username="$1"
314
     new_user_password="$2"
314
     new_user_password="$2"
315
-    is_admin_user='-a'
316
 
315
 
317
     read_config_param MY_USERNAME
316
     read_config_param MY_USERNAME
318
-    read_config_param ONION_ONLY
319
     read_config_param MATRIX_DOMAIN_NAME
317
     read_config_param MATRIX_DOMAIN_NAME
320
 
318
 
321
-    if [[ "$new_username" != "$MY_USERNAME" ]]; then
322
-        is_admin_user=''
323
-    fi
324
-
325
     ${PROJECT_NAME}-pass -u $new_username -a matrix -p "$new_user_password"
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
     else
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
     fi
325
     fi
332
     echo "0"
326
     echo "0"
333
 }
327
 }