cleanup

group_vars/matrix_servers

@@ -259,13 +259,14 @@ matrix_mautrix_signal_systemd_required_services_list: |
     ['matrix-mautrix-signal-daemon.service', 'matrix-mautrix-signal-db.service']
   }}
 
-matrix_mautrix_signal_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'si.as.token') | to_uuid }}"
 matrix_mautrix_signal_homeserver_domain: '{{ matrix_domain }}'
 
 matrix_mautrix_signal_homeserver_address: "{{ 'http://matrix-synapse:8008' if matrix_synapse_enabled else '' }}"
 
 matrix_mautrix_signal_homeserver_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'si.hs.token') | to_uuid }}"
 
+matrix_mautrix_signal_appservice_token: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'si.as.token') | to_uuid }}"
+
 matrix_mautrix_signal_login_shared_secret: "{{ matrix_synapse_ext_password_provider_shared_secret_auth_shared_secret if matrix_synapse_ext_password_provider_shared_secret_auth_enabled else '' }}"
 
 matrix_mautrix_signal_db_user: 'signal-db-user'

roles/matrix-bridge-mautrix-signal/defaults/main.yml

@@ -7,12 +7,11 @@ matrix_mautrix_signal_enabled: true
 matrix_mautrix_signal_docker_image: "dock.mau.dev/tulir/mautrix-signal:latest"
 matrix_mautrix_signal_docker_image_force_pull: "{{ matrix_mautrix_signal_docker_image.endswith(':latest') }}"
 
-matrix_mautrix_signal_base_path: "{{ matrix_base_data_path }}/mautrix-signal"
-matrix_mautrix_signal_config_path: "{{ matrix_mautrix_signal_base_path }}/bridge"
-
 matrix_mautrix_signal_daemon_docker_image: "dock.mau.dev/maunium/signald:latest"
 matrix_mautrix_signal_daemon_docker_image_force_pull: "{{ matrix_mautrix_signal_daemon_docker_image.endswith(':latest') }}"
 
+matrix_mautrix_signal_base_path: "{{ matrix_base_data_path }}/mautrix-signal"
+matrix_mautrix_signal_config_path: "{{ matrix_mautrix_signal_base_path }}/bridge"
 matrix_mautrix_signal_daemon_path: "{{ matrix_mautrix_signal_base_path }}/signald"
 
 # # Get your own API keys at https://my.telegram.org/apps

roles/matrix-bridge-mautrix-signal/tasks/validate_config.yml

@@ -6,10 +6,10 @@
       You need to define a required configuration setting (`{{ item }}`).
   when: "vars[item] == ''"
   with_items:
-    - "matrix_mautrix_signal_appservice_token"
     - "matrix_mautrix_signal_homeserver_domain"
     - "matrix_mautrix_signal_homeserver_address"
     - "matrix_mautrix_signal_homeserver_token"
+    - "matrix_mautrix_signal_appservice_token"
     - "matrix_mautrix_signal_db_user"
     - "matrix_mautrix_signal_db_password"
     - "matrix_mautrix_signal_db_database"