Merge pull request #676 from openshift-cherrypick-robot/cherry-pick-6…

…75-to-18.0-fr1 [18.0-fr1] [httpd] Set X-Forwarded-Proto only if empty
openstack-k8s-operators · Dec 18, 2024 · 634823b · 634823b
2 parents ef3dc51 + d20ca7a
commit 634823b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/templates/common/config/10-glance-httpd.conf b/templates/common/config/10-glance-httpd.conf
@@ -11,7 +11,11 @@
 
   ## Request header rules
   ## as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#requestheader
-  RequestHeader set X-Forwarded-Proto "https"
+{{- if $vhost.TLS }}
+  RequestHeader setIfEmpty X-Forwarded-Proto "https"
+{{- else }}
+  RequestHeader setIfEmpty X-Forwarded-Proto "http"
+{{- end }}
 
   TimeOut {{ $vhost.TimeOut }}