Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

This push request is about handling Traefik ipallowlist to synapse-ad… #4063

Merged
merged 4 commits into from
Feb 14, 2025
Merged

This push request is about handling Traefik ipallowlist to synapse-ad… #4063

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35d31c4
This push request is about handling Traefik ipallowlist to synapse-ad…
Feb 12, 2025
21a65a0
Merge branch 'spantaleev:master' into master
akdk7 Feb 13, 2025
509e70d
Changed position of variable and naming for better expandebility of t…
Feb 13, 2025
0203e99
Remove useless `noqa var-naming` comment and too many blank lines at …
spantaleev Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions roles/custom/matrix-synapse-admin/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,3 +215,9 @@ matrix_synapse_admin_config_asManagedUsers_custom: [] # noqa var-naming
# 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.
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: []
spantaleev marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 5 additions & 0 deletions roles/custom/matrix-synapse-admin/templates/labels.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ traefik.http.services.matrix-synapse-admin.loadbalancer.server.port=80

{% 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 %}

spantaleev marked this conversation as resolved.
Show resolved Hide resolved
{% 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.replacement=${1}/
Expand Down