Fix httpd config for X-Forwarded-Proto

openstack-k8s-operators · Jan 3, 2025 · b503b6f · b503b6f
1 parent 6e7951e
commit b503b6f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/templates/ironicapi/config/ironic-api-httpd.conf b/templates/ironicapi/config/ironic-api-httpd.conf
@@ -46,6 +46,8 @@ CustomLog /dev/stdout proxy env=forwarded
   SSLEngine on
   SSLCertificateFile      "{{ $vhost.SSLCertificateFile }}"
   SSLCertificateKeyFile   "{{ $vhost.SSLCertificateKeyFile }}"
+{{- else }}
+  SetEnvIf X-Forwarded-Proto http HTTPS=0
 {{- end }}
 
   ## WSGI configuration

diff --git a/templates/ironicinspector/config/httpd.conf b/templates/ironicinspector/config/httpd.conf
@@ -30,8 +30,12 @@ CustomLog /dev/stdout proxy env=forwarded
   ServerName {{ $vhost.ServerName }}
 
   ## Request header rules
-  ## as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#requestheader
-  RequestHeader set X-Forwarded-Proto "https"
+  ## as per http://httpd.apache.org/docs/2.4/mod/mod_headers.html#requestheader
+  {{- if $vhost.TLS }}
+    RequestHeader setIfEmpty X-Forwarded-Proto "https"
+  {{- else }}
+    RequestHeader setIfEmpty X-Forwarded-Proto "http"
+  {{- end }}
 
   ## Proxy rules
   ProxyRequests Off
@@ -46,6 +50,8 @@ CustomLog /dev/stdout proxy env=forwarded
   SSLEngine on
   SSLCertificateFile      "{{ $vhost.SSLCertificateFile }}"
   SSLCertificateKeyFile   "{{ $vhost.SSLCertificateKeyFile }}"
+{{- else }}
+  SetEnvIf X-Forwarded-Proto http HTTPS=0
 {{- end }}
 </VirtualHost>
 {{ end }}