Explorar el Código

Implement feedback from PR #1931

pull/1931/head
teutat3s hace 3 años
padre
commit
3632c158f3
No se encontró ninguna clave conocida en la base de datos para esta firma ID de clave GPG: 18DAE600A6BBE705
Se han modificado 3 ficheros con 1 adiciones y 13 borrados
  1. +0
    -1
      roles/matrix-base/tasks/setup_well_known.yml
  2. +1
    -3
      roles/matrix-base/templates/static-files/well-known/matrix-support.j2
  3. +0
    -9
      roles/matrix-nginx-proxy/tasks/setup_well_known.yml

+ 0
- 1
roles/matrix-base/tasks/setup_well_known.yml Ver fichero

@@ -43,4 +43,3 @@
mode: 0644 mode: 0644
owner: "{{ matrix_user_username }}" owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}" group: "{{ matrix_user_groupname }}"
when: matrix_homeserver_admin_contacts|length > 0

+ 1
- 3
roles/matrix-base/templates/static-files/well-known/matrix-support.j2 Ver fichero

@@ -1,9 +1,7 @@
#jinja2: lstrip_blocks: "True" #jinja2: lstrip_blocks: "True"
{ {
{% if matrix_homeserver_admin_contacts|length > 0 %}
"admins": {{ matrix_homeserver_admin_contacts|to_json }} "admins": {{ matrix_homeserver_admin_contacts|to_json }}
{% endif %}
{% if matrix_homeserver_support_url %}, {% if matrix_homeserver_support_url %},
"support_page": "{{ matrix_homeserver_support_url }}"
"support_page": "{{ matrix_homeserver_support_url|to_json }}"
{% endif %} {% endif %}
} }

+ 0
- 9
roles/matrix-nginx-proxy/tasks/setup_well_known.yml Ver fichero

@@ -23,12 +23,3 @@
mode: 0644 mode: 0644
owner: "{{ matrix_user_username }}" owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}" group: "{{ matrix_user_groupname }}"

- name: Ensure Matrix /.well-known/matrix/support configured
template:
src: "{{ role_path }}/templates/well-known/matrix-support.j2"
dest: "{{ matrix_static_files_base_path }}/.well-known/matrix"
mode: 0644
owner: "{{ matrix_user_username }}"
group: "{{ matrix_user_groupname }}"
when: matrix_homeserver_admin_contacts|length > 0

Cargando…
Cancelar
Guardar