소스 검색

Separate matrix user removal script generation

Bob Mottram 7 년 전
부모
커밋
3fb870a6ff
1개의 변경된 파일8개의 추가작업 그리고 5개의 파일을 삭제
  1. 8
    5
      src/freedombone-app-matrix

+ 8
- 5
src/freedombone-app-matrix 파일 보기

@@ -329,11 +329,7 @@ function matrix_generate {
329 329
     matrix_configure_homeserver_yaml "${turnkey}" $homeserver_config
330 330
 }
331 331
 
332
-function remove_user_matrix {
333
-    remove_username="$1"
334
-
335
-    ${PROJECT_NAME}-pass -u $remove_username --rmapp matrix
336
-
332
+function create_matrix_user_removal_script {
337 333
     read_config_param MY_USERNAME
338 334
     read_config_param MATRIX_DOMAIN_NAME
339 335
 
@@ -349,7 +345,13 @@ function remove_user_matrix {
349 345
     echo "curl -X POST 'https://$MATRIX_DOMAIN_NAME/_matrix/client/r0/admin/deactivate/%40\$remove_username%3A$MATRIX_DOMAIN_NAME?access_token=\$TOKEN' --data '{}'" >> $matrix_remove_user
350 346
 
351 347
     chmod +x $matrix_remove_user
348
+}
352 349
 
350
+function remove_user_matrix {
351
+    remove_username="$1"
352
+
353
+    create_matrix_user_removal_script
354
+    ${PROJECT_NAME}-pass -u $remove_username --rmapp matrix
353 355
     $matrix_remove_user "$remove_username"
354 356
 }
355 357
 
@@ -796,6 +798,7 @@ function install_matrix {
796 798
         echo $'Failed to add matrix admin user';
797 799
         exit 879352
798 800
     fi
801
+    create_matrix_user_removal_script
799 802
 
800 803
     set_completion_param "matrix domain" "$MATRIX_DOMAIN_NAME"
801 804