From 9dbee212d81f7584089ae0e77d69e2de52b04ff8 Mon Sep 17 00:00:00 2001
From: wjbeckett <wjbeckett@gmail.com>
Date: Mon, 30 Sep 2024 11:37:08 +1000
Subject: [PATCH] fix: removed duplicate keys.

---
 group_vars/matrix_servers                     |  7 ---
 .../matrix-element-call/defaults/main.yml     |  1 -
 .../templates/element-call-labels.j2-new      | 47 -------------------
 3 files changed, 55 deletions(-)
 delete mode 100644 roles/custom/matrix-element-call/templates/element-call-labels.j2-new

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 4ba3e6eb2..bf55b9a43 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -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_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
 matrix_element_call_jwt_service_url: "https://sfu-jwt.{{ matrix_domain }}"  # Default JWT service URL; adjust as needed
 
diff --git a/roles/custom/matrix-element-call/defaults/main.yml b/roles/custom/matrix-element-call/defaults/main.yml
index d5a9dbb2f..1b72ca0a1 100644
--- a/roles/custom/matrix-element-call/defaults/main.yml
+++ b/roles/custom/matrix-element-call/defaults/main.yml
@@ -12,7 +12,6 @@ element_web_config_path: "{{ matrix_base_data_path }}/static-files/public/.well-
 # Docker network configuration
 matrix_element_call_container_network: ''
 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
 
 # Docker images
diff --git a/roles/custom/matrix-element-call/templates/element-call-labels.j2-new b/roles/custom/matrix-element-call/templates/element-call-labels.j2-new
deleted file mode 100644
index 0428d056a..000000000
--- a/roles/custom/matrix-element-call/templates/element-call-labels.j2-new
+++ /dev/null
@@ -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 %}