From 2ec91c4c3febf0ca96f5ea98f55f62f74be1c052 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Thu, 21 Mar 2019 15:11:02 +0100 Subject: [PATCH] Remove overlapping Listen directives on apache >= 2.4 As mentioned on the apache docs[0] having 2 overlapping listen directories will cause the apache server to fail with a fatal error. The seems like it was ignored on earlier versions so we can use the version module to change it based on the current apache version as to not affect existing deployments [0] https://httpd.apache.org/docs/2.4/es/bind.html Change-Id: I8ce260e020375e93befa5e2e6df22eca0eaf9d07 --- horizon/values.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/horizon/values.yaml b/horizon/values.yaml index aaa14b0150..0aa9ee1830 100644 --- a/horizon/values.yaml +++ b/horizon/values.yaml @@ -59,8 +59,9 @@ network: conf: horizon: apache: | + Listen 0.0.0.0:{{ tuple "dashboard" "internal" "web" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy