Merge 692f1347b3 into 8fd8f12a0d

group_vars/matrix_servers

@@ -2543,6 +2543,9 @@ matrix_ssl_architecture: "{{
 matrix_ssl_pre_obtaining_required_service_name: "{{ 'matrix-dynamic-dns' if matrix_dynamic_dns_enabled else '' }}"
 
 matrix_nginx_proxy_access_log_syslog_integration_enabled: "{{ matrix_prometheus_nginxlog_exporter_enabled }}"
+matrix_prometheus_nginxlog_exporter_container_hostname: 'matrix-prometheus-nginxlog-exporter'
+matrix_prometheus_nginxlog_exporter_container_syslog_port: '6514'
+matrix_prometheus_nginxlog_exporter_container_metrics_port: '4040'
 matrix_nginx_proxy_access_log_syslog_integration_server_port: "{{ (matrix_prometheus_nginxlog_exporter_container_hostname | string +':'+ matrix_prometheus_nginxlog_exporter_container_syslog_port | string) | default('') }}"
 
 ######################################################################
@@ -2951,6 +2954,7 @@ matrix_client_element_integrations_jitsi_widget_url: "{{ matrix_dimension_integr
 matrix_client_element_self_check_validate_certificates: "{{ false if matrix_playbook_ssl_retrieval_method == 'self-signed' else true }}"
 
 matrix_client_element_registration_enabled: "{{ matrix_synapse_enable_registration }}"
+matrix_client_element_location_sharing_enabled: false
 
 matrix_client_element_enable_presence_by_hs_url: |
   {{

roles/custom/matrix-base/defaults/main.yml

@@ -325,10 +325,6 @@ run_postgres_import: true
 run_postgres_upgrade: true
 run_postgres_import_sqlite_db: true
 run_postgres_vacuum: true
-run_synapse_register_user: true
-run_synapse_update_user_password: true
-run_synapse_import_media_store: true
-run_synapse_rust_synapse_compress_state: true
 run_dendrite_register_user: true
 run_setup: true
 run_self_check: true

roles/custom/matrix-client-element/tasks/main.yml

@@ -7,7 +7,7 @@
     - when: matrix_client_element_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/prepare_themes.yml"
 
-    - when: matrix_client_element_enabled | bool
+    - when: matrix_client_element_enabled | bool and run_setup | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
   tags:
     - setup-all
@@ -16,14 +16,14 @@
     - install-client-element
 
 - block:
-    - when: not matrix_client_element_enabled | bool
+    - when: not matrix_client_element_enabled | bool and run_setup | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
   tags:
     - setup-all
     - setup-client-element
 
 - block:
-    - when: matrix_client_element_enabled | bool
+    - when: matrix_client_element_enabled | bool and run_self_check | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/self_check.yml"
   tags:
     - self-check

roles/custom/matrix-nginx-proxy/tasks/main.yml

@@ -29,8 +29,8 @@
     - install-all
     - install-nginx-proxy
 
-- block:
+- ansible.builtin.include_tasks: "{{ role_path }}/tasks/self_check_well_known.yml"
-    - ansible.builtin.include_tasks: "{{ role_path }}/tasks/self_check_well_known.yml"
+  when: run_self_check | bool
   tags:
     - self-check
 

roles/custom/matrix-synapse/defaults/main.yml

@@ -4,6 +4,16 @@
 
 matrix_synapse_enabled: true
 
+# Variables to control which part of the role is run
+# By default they are all true and filtering is done with tags
+# these variables are for use from other playbooks etc
+run_setup: true
+run_self_check: true
+run_synapse_register_user: true
+run_synapse_update_user_password: true
+run_synapse_import_media_store: true
+run_synapse_rust_synapse_compress_state: true
+
 matrix_synapse_container_image_self_build: false
 matrix_synapse_container_image_self_build_repo: "https://github.com/matrix-org/synapse.git"
 

roles/custom/matrix-synapse/tasks/main.yml

@@ -24,7 +24,7 @@
     - when: matrix_synapse_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml"
 
-    - when: matrix_synapse_enabled | bool
+    - when: matrix_synapse_enabled | bool and run_setup | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
   tags:
     - setup-all
@@ -33,41 +33,41 @@
     - install-synapse
 
 - block:
-    - when: not matrix_synapse_enabled | bool
+    - when: not matrix_synapse_enabled | bool and run_setup | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
   tags:
     - setup-all
     - setup-synapse
 
 - block:
-    - when: matrix_synapse_enabled | bool
+    - when: matrix_synapse_enabled | bool and run_synapse_import_media_store | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/import_media_store.yml"
   tags:
     - import-synapse-media-store
 
 - block:
-    - when: matrix_synapse_enabled | bool
+    - when: matrix_synapse_enabled | bool and run_synapse_register_user | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/register_user.yml"
   tags:
     - register-user
 
 - block:
-    - when: matrix_synapse_enabled | bool
+    - when: matrix_synapse_enabled | bool and run_synapse_update_user_password | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/update_user_password.yml"
   tags:
     - update-user-password
 
 - block:
-    - when: matrix_synapse_enabled | bool
+    - when: matrix_synapse_enabled | bool and run_synapse_rust_synapse_compress_state | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/rust-synapse-compress-state/main.yml"
   tags:
     - rust-synapse-compress-state
 
 - block:
-    - when: matrix_synapse_enabled | bool
+    - when: matrix_synapse_enabled | bool and run_self_check | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/self_check_client_api.yml"
 
-    - when: matrix_synapse_enabled | bool
+    - when: matrix_synapse_enabled | bool and run_self_check | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/self_check_federation_api.yml"
   tags:
     - self-check