mirror/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2025-01-15 12:43:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: removed duplicate keys.

Browse Source
This commit is contained in:
wjbeckett 2024-09-30 11:37:08 +10:00
parent 1167e1ec13
commit 9dbee212d8
3 changed files with 0 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
group_vars/matrix_servers
View File

@ -5904,13 +5904,6 @@ matrix_element_call_container_labels_traefik_docker_network: "{{ matrix_playbook
matrix_element_call_container_labels_traefik_entrypoints: "{{ devture_traefik_entrypoint_primary }}" matrix_element_call_container_labels_traefik_entrypoints: "{{ devture_traefik_entrypoint_primary }}"
matrix_element_call_container_labels_traefik_tls_certResolver: "{{ devture_traefik_certResolver_primary }}" matrix_element_call_container_labels_traefik_tls_certResolver: "{{ devture_traefik_certResolver_primary }}"
matrix_element_call_container_labels_traefik_enabled: true
matrix_element_call_container_labels_traefik_docker_network: "{{ matrix_playbook_reverse_proxyable_services_additional_network }}"
matrix_element_call_container_labels_traefik_hostname: "{{ matrix_element_call_hostname }}"
matrix_element_call_container_labels_traefik_path_prefix: "{{ matrix_element_call_path_prefix }}"
matrix_element_call_container_labels_traefik_rule: "Host(`{{ matrix_element_call_container_labels_traefik_hostname }}`)"
# JWT Service Configuration # JWT Service Configuration
matrix_element_call_jwt_service_url: "https://sfu-jwt.{{ matrix_domain }}" # Default JWT service URL; adjust as needed matrix_element_call_jwt_service_url: "https://sfu-jwt.{{ matrix_domain }}" # Default JWT service URL; adjust as needed

1
roles/custom/matrix-element-call/defaults/main.yml
View File

@ -12,7 +12,6 @@ element_web_config_path: "{{ matrix_base_data_path }}/static-files/public/.well-
# Docker network configuration # Docker network configuration
matrix_element_call_container_network: '' matrix_element_call_container_network: ''
matrix_element_call_container_http_host_bind_port: '' matrix_element_call_container_http_host_bind_port: ''
matrix_element_call_container_labels_traefik_additional_response_headers: {}
matrix_element_call_container_additional_networks: [] # No additional networks by default matrix_element_call_container_additional_networks: [] # No additional networks by default
# Docker images # Docker images

47
roles/custom/matrix-element-call/templates/element-call-labels.j2-new
View File

@ -1,47 +0,0 @@
{% if matrix_element_call_container_labels_traefik_enabled %}
traefik.enable=true
# Network configuration for Traefik
{% if matrix_element_call_container_labels_traefik_docker_network %}
traefik.docker.network={{ matrix_element_call_container_labels_traefik_docker_network }}
{% endif %}
# Traefik Router and Service configuration for Element Call
traefik.http.routers.element-call-router.rule=Host(`{{ matrix_element_call_container_labels_traefik_hostname }}`)
traefik.http.routers.element-call-router.entrypoints={{ matrix_element_call_container_labels_traefik_entrypoints }}
traefik.http.routers.element-call-router.tls.certresolver={{ matrix_element_call_container_labels_traefik_tls_certResolver }}
traefik.http.services.element-call-service.loadbalancer.server.port=8080
{% set middlewares = [] %}
# Path prefix handling for Element Call
{% if matrix_element_call_container_labels_traefik_path_prefix != '/' %}
traefik.http.middlewares.element-call-slashless-redirect.redirectregex.regex=({{ matrix_element_call_container_labels_traefik_path_prefix | quote }})$
traefik.http.middlewares.element-call-slashless-redirect.redirectregex.replacement=${1}/
{% set middlewares = middlewares + ['element-call-slashless-redirect'] %}
traefik.http.middlewares.element-call-strip-prefix.stripprefix.prefixes={{ matrix_element_call_container_labels_traefik_path_prefix }}
{% set middlewares = middlewares + ['element-call-strip-prefix'] %}
{% endif %}
# Additional response headers for Element Call
{% if matrix_element_call_container_labels_traefik_additional_response_headers is defined and matrix_element_call_container_labels_traefik_additional_response_headers | length > 0 %}
{% for name, value in matrix_element_call_container_labels_traefik_additional_response_headers.items() %}
traefik.http.middlewares.element-call-add-headers.headers.customresponseheaders.{{ name }}={{ value }}
{% endfor %}
{% set middlewares = middlewares + ['element-call-add-headers'] %}
{% endif %}
# Apply middlewares to the Element Call router
{% if middlewares | length > 0 %}
traefik.http.routers.element-call-router.middlewares={{ middlewares | join(',') }}
{% endif %}
{% endif %}
# Additional labels (if any) specified by the user
{% if matrix_element_call_container_extra_arguments is defined and matrix_element_call_container_extra_arguments | length > 0 %}
{% for key, value in matrix_element_call_container_extra_arguments.items() %}
{{ key }}={{ value }}
{% endfor %}
{% endif %}