Merge pull request #508 from mumesan/fix_httpd_requestheader

Fix httpd config for X-Forwarded-Proto Jira: <OSPRH-12377>

Author: openshift-merge-bot[bot]

templates/ironicapi/config/ironic-api-httpd.conf

@@ -39,14 +39,16 @@ CustomLog /dev/stdout proxy env=forwarded
     Require all granted
   </Directory>
 
-{{- if $vhost.TLS }}
+  {{- if $vhost.TLS }}
   SetEnvIf X-Forwarded-Proto https HTTPS=1
 
   ## SSL directives
   SSLEngine on
   SSLCertificateFile      "{{ $vhost.SSLCertificateFile }}"
   SSLCertificateKeyFile   "{{ $vhost.SSLCertificateKeyFile }}"
-{{- end }}
+  {{- else }}
+  SetEnvIf X-Forwarded-Proto http HTTPS=0
+  {{- end }}
 
   ## WSGI configuration
   WSGIApplicationGroup %{GLOBAL}

templates/ironicinspector/config/httpd.conf

@@ -30,22 +30,28 @@ 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
   ProxyPreserveHost Off
   ProxyPass / http://localhost:5051/ retry=10
   ProxyPassReverse / http://localhost:5051/
 
-{{- if $vhost.TLS }}
+  {{- if $vhost.TLS }}
   SetEnvIf X-Forwarded-Proto https HTTPS=1
 
   ## SSL directives
   SSLEngine on
   SSLCertificateFile      "{{ $vhost.SSLCertificateFile }}"
   SSLCertificateKeyFile   "{{ $vhost.SSLCertificateKeyFile }}"
-{{- end }}
+  {{- else }}
+  SetEnvIf X-Forwarded-Proto http HTTPS=0
+  {{- end }}
 </VirtualHost>
 {{ end }}