From 3fbae4882e0d2c058cd42ee2cfd6b0b41f7a29f8 Mon Sep 17 00:00:00 2001
From: Christian Iuga <ciuga@embl.fr>
Date: Tue, 16 Apr 2024 13:39:33 +0200
Subject: [PATCH] move keycloak_quarkus_proxy_headers into keycloak.conf

---
 roles/keycloak_quarkus/templates/keycloak.conf.j2    | 7 ++++++-
 roles/keycloak_quarkus/templates/keycloak.service.j2 | 6 +-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/roles/keycloak_quarkus/templates/keycloak.conf.j2 b/roles/keycloak_quarkus/templates/keycloak.conf.j2
index b23a250..20d3f7f 100644
--- a/roles/keycloak_quarkus/templates/keycloak.conf.j2
+++ b/roles/keycloak_quarkus/templates/keycloak.conf.j2
@@ -54,9 +54,14 @@ cache-config-file=cache-ispn.xml
 {% endif %}
 
 {% if keycloak_quarkus_proxy_mode is defined and keycloak_quarkus_proxy_mode != "none" %}
-# Proxy
+# Deprecated Proxy configuration
 proxy={{ keycloak_quarkus_proxy_mode }}
 {% endif %}
+{% if keycloak_quarkus_proxy_headers is defined and keycloak_quarkus_proxy_headers != "none" %}
+# Proxy
+proxy-headers={{ keycloak_quarkus_proxy_headers }}
+{% endif %}
+
 spi-sticky-session-encoder-infinispan-should-attach-route={{ keycloak_quarkus_spi_sticky_session_encoder_infinispan_should_attach_route | d(true) | lower }}
 
 # Transaction
diff --git a/roles/keycloak_quarkus/templates/keycloak.service.j2 b/roles/keycloak_quarkus/templates/keycloak.service.j2
index 46c7f34..30f4273 100644
--- a/roles/keycloak_quarkus/templates/keycloak.service.j2
+++ b/roles/keycloak_quarkus/templates/keycloak.service.j2
@@ -7,12 +7,8 @@ After=network.target
 Type=simple
 EnvironmentFile=-{{ keycloak_quarkus_sysconf_file }}
 PIDFile={{ keycloak_quarkus_service_pidfile }}
-{% if keycloak_quarkus_start_dev and keycloak_quarkus_proxy_headers is defined %}
-ExecStart={{ keycloak.home }}/bin/kc.sh start-dev --proxy-headers {{ keycloak_quarkus_proxy_headers }}
-{% elif keycloak_quarkus_start_dev and keycloak_quarkus_proxy_headers is not defined %}
+{% if keycloak_quarkus_start_dev %}
 ExecStart={{ keycloak.home }}/bin/kc.sh start-dev
-{% elif not keycloak_quarkus_start_dev and keycloak_quarkus_proxy_headers is defined %}
-ExecStart={{ keycloak.home }}/bin/kc.sh start --optimized --proxy-headers {{ keycloak_quarkus_proxy_headers }}
 {% else -%}
 ExecStart={{ keycloak.home }}/bin/kc.sh start --optimized
 {% endif %}