Also get rid of `--tags=update-user-password` in the `matrix-dendrite` role, as what we had doesn't work. We may be able to do it with some Ansible helper or something else. For now, we'll omit this feature.pull/1520/head
| @@ -228,6 +228,7 @@ run_synapse_register_user: true | |||||
| run_synapse_update_user_password: true | run_synapse_update_user_password: true | ||||
| run_synapse_import_media_store: true | run_synapse_import_media_store: true | ||||
| run_synapse_rust_synapse_compress_state: true | run_synapse_rust_synapse_compress_state: true | ||||
| run_dendrite_register_user: true | |||||
| run_setup: true | run_setup: true | ||||
| run_self_check: true | run_self_check: true | ||||
| run_start: true | run_start: true | ||||
| @@ -15,7 +15,7 @@ | |||||
| - setup-dendrite | - setup-dendrite | ||||
| - import_tasks: "{{ role_path }}/tasks/register_user.yml" | - import_tasks: "{{ role_path }}/tasks/register_user.yml" | ||||
| when: run_dendrite_register_user|bool | |||||
| when: run_dendrite_register_user|bool and matrix_dendrite_enabled|bool | |||||
| tags: | tags: | ||||
| - register-user | - register-user | ||||
| @@ -33,11 +33,6 @@ | |||||
| tags: | tags: | ||||
| - self-check | - self-check | ||||
| - import_tasks: "{{ role_path }}/tasks/update_user_password.yml" | |||||
| when: run_dendrite_update_user_password|bool | |||||
| tags: | |||||
| - update-user-password | |||||
| - name: Mark matrix-dendrite role as executed | - name: Mark matrix-dendrite role as executed | ||||
| set_fact: | set_fact: | ||||
| matrix_dendrite_role_executed: true | matrix_dendrite_role_executed: true | ||||
| @@ -1,41 +0,0 @@ | |||||
| --- | |||||
| - name: Fail if playbook called incorrectly | |||||
| fail: | |||||
| msg: "The `username` variable needs to be provided to this playbook, via --extra-vars" | |||||
| when: "username is not defined or username == '<your-username>'" | |||||
| - name: Fail if playbook called incorrectly | |||||
| fail: | |||||
| msg: "The `password` variable needs to be provided to this playbook, via --extra-vars" | |||||
| when: "password is not defined or password == '<your-password>'" | |||||
| - name: Fail if not using matrix-postgres container | |||||
| fail: | |||||
| msg: "This command is working only when matrix-postgres container is being used" | |||||
| when: "not matrix_postgres_enabled|bool" | |||||
| - name: Ensure matrix-dendrite is started | |||||
| service: | |||||
| name: matrix-dendrite | |||||
| state: started | |||||
| daemon_reload: yes | |||||
| register: start_result | |||||
| - name: Ensure matrix-postgres is started | |||||
| service: | |||||
| name: matrix-postgres | |||||
| state: started | |||||
| daemon_reload: yes | |||||
| register: postgres_start_result | |||||
| - name: Wait a while, so that Matrix Dendrite can manage to start | |||||
| pause: | |||||
| seconds: 7 | |||||
| when: "start_result.changed or postgres_start_result.changed" | |||||
| - name: Generate password hash | |||||
| shell: "{{ matrix_host_command_docker }} exec matrix-dendrite /usr/local/bin/hash_password -c /data/homeserver.yaml -p {{ password|quote }}" | |||||
| register: password_hash | |||||
| - name: Update user password hash | |||||
| command: "{{ matrix_local_bin_path }}/matrix-postgres-update-user-password-hash {{ username|quote }} {{ password_hash.stdout|quote }}" | |||||
| @@ -20,7 +20,7 @@ | |||||
| - import-synapse-media-store | - import-synapse-media-store | ||||
| - import_tasks: "{{ role_path }}/tasks/register_user.yml" | - import_tasks: "{{ role_path }}/tasks/register_user.yml" | ||||
| when: run_synapse_register_user|bool | |||||
| when: run_synapse_register_user|bool and matrix_synapse_enabled|bool | |||||
| tags: | tags: | ||||
| - register-user | - register-user | ||||
| @@ -39,7 +39,7 @@ | |||||
| - self-check | - self-check | ||||
| - import_tasks: "{{ role_path }}/tasks/update_user_password.yml" | - import_tasks: "{{ role_path }}/tasks/update_user_password.yml" | ||||
| when: run_synapse_update_user_password|bool | |||||
| when: run_synapse_update_user_password|bool and matrix_synapse_enabled|bool | |||||
| tags: | tags: | ||||
| - update-user-password | - update-user-password | ||||