Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openstack-k8s-operators/telemetry-operator
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3cdbe39570434280313c698a950e26da108deca9
Choose a base ref
..
head repository: openstack-k8s-operators/telemetry-operator
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 647afff7c4c7edf1c88ac1ca81c244168a464382
Choose a head ref
Showing with 9 additions and 1 deletion.
  1. +8 −0 templates/autoscaling/config/wsgi-aodh.conf
  2. +1 −1 templates/ceilometercentral/config/httpd.conf
8 changes: 8 additions & 0 deletions templates/autoscaling/config/wsgi-aodh.conf
Original file line number Diff line number Diff line change
@@ -19,6 +19,14 @@
ServerSignature Off
CustomLog /dev/stdout combined

## Request header rules
## as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#requestheader
{{- if $vhost.TLS }}
RequestHeader setIfEmpty X-Forwarded-Proto "https"
{{- else }}
RequestHeader setIfEmpty X-Forwarded-Proto "http"
{{- end }}

{{- if $vhost.TLS }}
SetEnvIf X-Forwarded-Proto https HTTPS=1

2 changes: 1 addition & 1 deletion templates/ceilometercentral/config/httpd.conf
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ CustomLog /dev/stdout proxy env=forwarded

## Request header rules
## as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#requestheader
{{- if $vhost.TLS }}
{{- if .TLS }}
RequestHeader setIfEmpty X-Forwarded-Proto "https"
{{- else }}
RequestHeader setIfEmpty X-Forwarded-Proto "http"