From 4a5143fa8dde0e6c4648452dd5106f5c0375907b Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 18 Jul 2022 12:32:38 +0300 Subject: [PATCH] Add variable to influence whether /.well-known/matrix/support is created Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1931 --- roles/matrix-base/defaults/main.yml | 7 +++++++ roles/matrix-base/tasks/setup_well_known.yml | 11 +++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml index b8bea562a..6095f730e 100644 --- a/roles/matrix-base/defaults/main.yml +++ b/roles/matrix-base/defaults/main.yml @@ -21,8 +21,10 @@ matrix_admin: '' # role: admin # - email_address: security@domain.tld # role: security +# Also see: `matrix_well_known_matrix_support_enabled` matrix_homeserver_admin_contacts: [] # Url string like https://domain.tld/support.html +# Also see: `matrix_well_known_matrix_support_enabled` matrix_homeserver_support_url: '' # This will contain the homeserver implementation that is in use. @@ -267,6 +269,11 @@ matrix_vars_yml_snapshotting_src: "{{ inventory_dir }}/host_vars/{{ inventory_ho # matrix domain (`matrix_server_fqn_matrix`). matrix_well_known_matrix_server_enabled: true +# Controls whether a `/.well-known/matrix/support` file is generated and used at all. +# +# See `matrix_homeserver_admin_contacts`, `matrix_homeserver_support_url`, etc. +matrix_well_known_matrix_support_enabled: true + # Controls whether Docker is automatically installed. # If you change this to false you must install and update Docker manually. You also need to install the docker (https://pypi.org/project/docker/) Python package. matrix_docker_installation_enabled: true diff --git a/roles/matrix-base/tasks/setup_well_known.yml b/roles/matrix-base/tasks/setup_well_known.yml index 44ef3d28a..da9b534f8 100644 --- a/roles/matrix-base/tasks/setup_well_known.yml +++ b/roles/matrix-base/tasks/setup_well_known.yml @@ -37,9 +37,16 @@ when: "not matrix_well_known_matrix_server_enabled|bool" - name: Ensure Matrix /.well-known/matrix/support file configured - copy: - content: "{{ matrix_well_known_matrix_support_configuration|to_nice_json }}" + ansible.builtin.copy: + content: "{{ matrix_well_known_matrix_support_configuration | to_nice_json }}" dest: "{{ matrix_static_files_base_path }}/.well-known/matrix/support" mode: 0644 owner: "{{ matrix_user_username }}" group: "{{ matrix_user_groupname }}" + when: matrix_well_known_matrix_support_enabled | bool + +- name: Ensure Matrix /.well-known/matrix/support file deleted + ansible.builtin.file: + path: "{{ matrix_static_files_base_path }}/.well-known/matrix/support" + state: absent + when: "not matrix_well_known_matrix_support_enabled | bool"