Explorar el Código

This push request is about handling Traefik ipallowlist to synapse-admin application.

It's my first push request. If I forgot something please let me know. :-)
pull/4063/head
AkDk7 hace 1 año
padre
commit
35d31c4b9a
Se han modificado 2 ficheros con 11 adiciones y 0 borrados
  1. +6
    -0
      roles/custom/matrix-synapse-admin/defaults/main.yml
  2. +5
    -0
      roles/custom/matrix-synapse-admin/templates/labels.j2

+ 6
- 0
roles/custom/matrix-synapse-admin/defaults/main.yml Ver fichero

@@ -215,3 +215,9 @@ matrix_synapse_admin_config_asManagedUsers_custom: [] # noqa var-naming
# Example for mautrix-telegram: ["^@telegram_[a-zA-Z0-9]+:example\\.com$"] # Example for mautrix-telegram: ["^@telegram_[a-zA-Z0-9]+:example\\.com$"]
# WARNING: you want to use matrix_synapse_admin_config_asManagedUsers_custom instead of this variable. # WARNING: you want to use matrix_synapse_admin_config_asManagedUsers_custom instead of this variable.
matrix_synapse_admin_config_asManagedUsers: "{{ matrix_synapse_admin_config_asManagedUsers_auto + matrix_synapse_admin_config_asManagedUsers_custom }}" # noqa var-naming matrix_synapse_admin_config_asManagedUsers: "{{ matrix_synapse_admin_config_asManagedUsers_auto + matrix_synapse_admin_config_asManagedUsers_custom }}" # noqa var-naming

# This setting is to define a list ip addresses to allow access to synapse-admin.
# Each IP address should be in CIDR format, e.g. xxx.xxx.xxx.xxx/xx.
# For more information, see: https://doc.traefik.io/traefik/middlewares/http/ipallowlist/
# If the list is empty, all IP addresses are allowed.
matrix_synapse_admin_container_labels_traefik_ipallowlist: []

+ 5
- 0
roles/custom/matrix-synapse-admin/templates/labels.j2 Ver fichero

@@ -9,6 +9,11 @@ traefik.http.services.matrix-synapse-admin.loadbalancer.server.port=80


{% set middlewares = [] %} {% set middlewares = [] %}


{% if matrix_synapse_admin_container_labels_traefik_ipallowlist is defined and matrix_synapse_admin_container_labels_traefik_ipallowlist | length > 0 %}
traefik.http.middlewares.matrix-synapse-admin-ipallowlist.ipallowlist.sourcerange={{ matrix_synapse_admin_container_labels_traefik_ipallowlist | join(',') }}
{% set middlewares = middlewares + ['matrix-synapse-admin-ipallowlist'] %}
{% endif %}

{% if matrix_synapse_admin_container_labels_traefik_path_prefix != '/' %} {% if matrix_synapse_admin_container_labels_traefik_path_prefix != '/' %}
traefik.http.middlewares.matrix-synapse-admin-slashless-redirect.redirectregex.regex=({{ matrix_synapse_admin_container_labels_traefik_path_prefix | quote }})$ traefik.http.middlewares.matrix-synapse-admin-slashless-redirect.redirectregex.regex=({{ matrix_synapse_admin_container_labels_traefik_path_prefix | quote }})$
traefik.http.middlewares.matrix-synapse-admin-slashless-redirect.redirectregex.replacement=${1}/ traefik.http.middlewares.matrix-synapse-admin-slashless-redirect.redirectregex.replacement=${1}/


Cargando…
Cancelar
Guardar