Просмотр исходного кода

Add the ability to control (Traefik) routing priority for Element and synapse-admin

This may proof useful to someone in the future.
pull/2483/head
Slavi Pantaleev 3 лет назад
Родитель
Сommit
799cbb44fb
4 измененных файлов: 8 добавлений и 0 удалений
  1. +1
    -0
      roles/custom/matrix-client-element/defaults/main.yml
  2. +3
    -0
      roles/custom/matrix-client-element/templates/labels.j2
  3. +1
    -0
      roles/custom/matrix-synapse-admin/defaults/main.yml
  4. +3
    -0
      roles/custom/matrix-synapse-admin/templates/labels.j2

+ 1
- 0
roles/custom/matrix-client-element/defaults/main.yml Просмотреть файл

@@ -41,6 +41,7 @@ matrix_client_element_container_labels_traefik_hostname: "{{ matrix_server_fqn_e
# The path prefix must either be `/` or not end with a slash (e.g. `/element`).
matrix_client_element_container_labels_traefik_path_prefix: /
matrix_client_element_container_labels_traefik_rule: "Host(`{{ matrix_client_element_container_labels_traefik_hostname }}`){% if matrix_client_element_container_labels_traefik_path_prefix != '/' %} && PathPrefix(`{{ matrix_client_element_container_labels_traefik_path_prefix }}`){% endif %}"
matrix_client_element_container_labels_traefik_priority: 0
matrix_client_element_container_labels_traefik_entrypoints: web-secure
matrix_client_element_container_labels_traefik_tls: "{{ matrix_client_element_container_labels_traefik_entrypoints != 'web' }}"
matrix_client_element_container_labels_traefik_tls_certResolver: default # noqa var-naming


+ 3
- 0
roles/custom/matrix-client-element/templates/labels.j2 Просмотреть файл

@@ -26,6 +26,9 @@ traefik.http.middlewares.matrix-client-element-add-headers.headers.customrespons
{% endif %}

traefik.http.routers.matrix-client-element.rule={{ matrix_client_element_container_labels_traefik_rule }}
{% if matrix_client_element_container_labels_traefik_priority | int > 0 %}
traefik.http.routers.matrix-client-element.priority={{ matrix_client_element_container_labels_traefik_priority }}
{% endif %}
traefik.http.routers.matrix-client-element.service=matrix-client-element
{% if middlewares | length > 0 %}
traefik.http.routers.matrix-client-element.middlewares={{ middlewares | join(',') }}


+ 1
- 0
roles/custom/matrix-synapse-admin/defaults/main.yml Просмотреть файл

@@ -45,6 +45,7 @@ matrix_synapse_admin_container_labels_traefik_hostname: "{{ matrix_server_fqn_ma
# The path prefix must either be `/` or not end with a slash (e.g. `/synapse-admin`).
matrix_synapse_admin_container_labels_traefik_path_prefix: "{{ matrix_synapse_admin_public_endpoint }}"
matrix_synapse_admin_container_labels_traefik_rule: "Host(`{{ matrix_synapse_admin_container_labels_traefik_hostname }}`){% if matrix_synapse_admin_container_labels_traefik_path_prefix != '/' %} && PathPrefix(`{{ matrix_synapse_admin_container_labels_traefik_path_prefix | quote }}`){% endif %}"
matrix_synapse_admin_container_labels_traefik_priority: 0
matrix_synapse_admin_container_labels_traefik_entrypoints: web-secure
matrix_synapse_admin_container_labels_traefik_tls: "{{ matrix_synapse_admin_container_labels_traefik_entrypoints != 'web' }}"
matrix_synapse_admin_container_labels_traefik_tls_certResolver: default # noqa var-naming


+ 3
- 0
roles/custom/matrix-synapse-admin/templates/labels.j2 Просмотреть файл

@@ -26,6 +26,9 @@ traefik.http.middlewares.matrix-synapse-admin-add-headers.headers.customresponse
{% endif %}

traefik.http.routers.matrix-synapse-admin.rule={{ matrix_synapse_admin_container_labels_traefik_rule }}
{% if matrix_synapse_admin_container_labels_traefik_priority | int > 0 %}
traefik.http.routers.matrix-synapse-admin.priority={{ matrix_synapse_admin_container_labels_traefik_priority }}
{% endif %}
{% if middlewares | length > 0 %}
traefik.http.routers.matrix-synapse-admin.middlewares={{ middlewares | join(',') }}
{% endif %}


Загрузка…
Отмена
Сохранить