diff --git a/aodh/values.yaml b/aodh/values.yaml index 5c79b98648..f4e102f63c 100644 --- a/aodh/values.yaml +++ b/aodh/values.yaml @@ -406,10 +406,7 @@ conf: WSGIProcessGroup aodh WSGIScriptAlias / /var/www/cgi-bin/aodh/aodh-api WSGIApplicationGroup %{GLOBAL} - = 2.4> - ErrorLogFormat "%{cu}t %M" - - + ErrorLogFormat "%{cu}t %M" ErrorLog /dev/stdout SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded CustomLog /dev/stdout combined env=!forwarded diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml index 5467f118a9..0360e7b3be 100644 --- a/ceilometer/values.yaml +++ b/ceilometer/values.yaml @@ -1474,13 +1474,7 @@ conf: WSGIApplicationGroup %{GLOBAL} - = 2.4> - Require all granted - - - Order allow,deny - Allow from all - + Require all granted ErrorLog /dev/stdout CustomLog /dev/stdout combined diff --git a/horizon/values.yaml b/horizon/values.yaml index c6c556a883..be7702a3c7 100644 --- a/horizon/values.yaml +++ b/horizon/values.yaml @@ -84,9 +84,6 @@ conf: logo_splash: favicon: 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 @@ -114,9 +111,7 @@ conf: SetHandler static - = 2.4> - ErrorLogFormat "%{cu}t %M" - + ErrorLogFormat "%{cu}t %M" ErrorLog /dev/stdout TransferLog /dev/stdout diff --git a/keystone/values.yaml b/keystone/values.yaml index b7937a7ab0..ec44791371 100644 --- a/keystone/values.yaml +++ b/keystone/values.yaml @@ -794,9 +794,7 @@ conf: WSGIScriptAlias / /var/www/cgi-bin/keystone/keystone-wsgi-public WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On - = 2.4> - ErrorLogFormat "%{cu}t %M" - + ErrorLogFormat "%{cu}t %M" ErrorLog /dev/stdout SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded diff --git a/monasca/values.yaml b/monasca/values.yaml index 09146ec89b..b7f57fc6e3 100644 --- a/monasca/values.yaml +++ b/monasca/values.yaml @@ -258,9 +258,7 @@ conf: WSGIScriptAlias / /var/www/cgi-bin/monasca/monasca-api-wsgi WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On - = 2.4> - ErrorLogFormat "%{cu}t %M" - + ErrorLogFormat "%{cu}t %M" ErrorLog /dev/stdout SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded diff --git a/values_overrides/cinder/tls.yaml b/values_overrides/cinder/tls.yaml index 1b6c834bdd..f63b090146 100644 --- a/values_overrides/cinder/tls.yaml +++ b/values_overrides/cinder/tls.yaml @@ -43,10 +43,8 @@ conf: WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On AllowEncodedSlashes On - = 2.4> - ErrorLogFormat "%{cu}t %M" - SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded + ErrorLogFormat "%{cu}t %M" ErrorLog /dev/stdout CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout proxy env=forwarded diff --git a/values_overrides/heat/tls.yaml b/values_overrides/heat/tls.yaml index a958f1978c..89a360d516 100644 --- a/values_overrides/heat/tls.yaml +++ b/values_overrides/heat/tls.yaml @@ -31,10 +31,8 @@ conf: WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On AllowEncodedSlashes On - = 2.4> - ErrorLogFormat "%{cu}t %M" - SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded + ErrorLogFormat "%{cu}t %M" ErrorLog /dev/stdout CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout proxy env=forwarded @@ -58,10 +56,8 @@ conf: WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On AllowEncodedSlashes On - = 2.4> - ErrorLogFormat "%{cu}t %M" - SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded + ErrorLogFormat "%{cu}t %M" ErrorLog /dev/stdout CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout proxy env=forwarded diff --git a/values_overrides/horizon/tls.yaml b/values_overrides/horizon/tls.yaml index c273dcc638..818a5509bb 100644 --- a/values_overrides/horizon/tls.yaml +++ b/values_overrides/horizon/tls.yaml @@ -13,9 +13,6 @@ conf: - ssl 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 @@ -51,9 +48,7 @@ conf: SetHandler static - = 2.4> - ErrorLogFormat "%{cu}t %M" - + ErrorLogFormat "%{cu}t %M" ErrorLog /dev/stdout TransferLog /dev/stdout diff --git a/values_overrides/keystone/tls.yaml b/values_overrides/keystone/tls.yaml index cded837b1d..17bd336f49 100644 --- a/values_overrides/keystone/tls.yaml +++ b/values_overrides/keystone/tls.yaml @@ -44,9 +44,7 @@ conf: WSGIScriptAlias / /var/www/cgi-bin/keystone/keystone-wsgi-public WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On - = 2.4> - ErrorLogFormat "%{cu}t %M" - + ErrorLogFormat "%{cu}t %M" ErrorLog /dev/stdout SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded diff --git a/values_overrides/nova/tls.yaml b/values_overrides/nova/tls.yaml index 5cf2d727a6..717c379cb4 100644 --- a/values_overrides/nova/tls.yaml +++ b/values_overrides/nova/tls.yaml @@ -34,10 +34,8 @@ conf: WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On AllowEncodedSlashes On - = 2.4> - ErrorLogFormat "%{cu}t %M" - SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded + ErrorLogFormat "%{cu}t %M" ErrorLog /dev/stdout CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout proxy env=forwarded @@ -60,10 +58,8 @@ conf: WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On AllowEncodedSlashes On - = 2.4> - ErrorLogFormat "%{cu}t %M" - SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded + ErrorLogFormat "%{cu}t %M" ErrorLog /dev/stdout CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout proxy env=forwarded diff --git a/values_overrides/openstack/heat/tls.yaml b/values_overrides/openstack/heat/tls.yaml index dab42c1e28..ce0ee5d111 100644 --- a/values_overrides/openstack/heat/tls.yaml +++ b/values_overrides/openstack/heat/tls.yaml @@ -32,10 +32,8 @@ heat: WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On AllowEncodedSlashes On - = 2.4> - ErrorLogFormat "%{cu}t %M" - SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded + ErrorLogFormat "%{cu}t %M" ErrorLog /dev/stdout CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout proxy env=forwarded @@ -59,10 +57,8 @@ heat: WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On AllowEncodedSlashes On - = 2.4> - ErrorLogFormat "%{cu}t %M" - SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded + ErrorLogFormat "%{cu}t %M" ErrorLog /dev/stdout CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout proxy env=forwarded diff --git a/values_overrides/openstack/horizon/tls.yaml b/values_overrides/openstack/horizon/tls.yaml index a104067913..8a9d5d04c5 100644 --- a/values_overrides/openstack/horizon/tls.yaml +++ b/values_overrides/openstack/horizon/tls.yaml @@ -14,9 +14,6 @@ horizon: - ssl 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 @@ -52,9 +49,7 @@ horizon: SetHandler static - = 2.4> - ErrorLogFormat "%{cu}t %M" - + ErrorLogFormat "%{cu}t %M" ErrorLog /dev/stdout TransferLog /dev/stdout diff --git a/values_overrides/openstack/keystone/tls.yaml b/values_overrides/openstack/keystone/tls.yaml index d950679b15..d06bdae545 100644 --- a/values_overrides/openstack/keystone/tls.yaml +++ b/values_overrides/openstack/keystone/tls.yaml @@ -46,9 +46,7 @@ keystone: WSGIScriptAlias / /var/www/cgi-bin/keystone/keystone-wsgi-public WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On - = 2.4> - ErrorLogFormat "%{cu}t %M" - + ErrorLogFormat "%{cu}t %M" ErrorLog /dev/stdout SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded diff --git a/values_overrides/openstack/nova/tls.yaml b/values_overrides/openstack/nova/tls.yaml index ea25ab6583..95df1b182b 100644 --- a/values_overrides/openstack/nova/tls.yaml +++ b/values_overrides/openstack/nova/tls.yaml @@ -35,10 +35,8 @@ nova: WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On AllowEncodedSlashes On - = 2.4> - ErrorLogFormat "%{cu}t %M" - SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded + ErrorLogFormat "%{cu}t %M" ErrorLog /dev/stdout CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout proxy env=forwarded @@ -61,10 +59,8 @@ nova: WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On AllowEncodedSlashes On - = 2.4> - ErrorLogFormat "%{cu}t %M" - SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded + ErrorLogFormat "%{cu}t %M" ErrorLog /dev/stdout CustomLog /dev/stdout combined env=!forwarded CustomLog /dev/stdout proxy env=forwarded diff --git a/values_overrides/openstack/placement/tls.yaml b/values_overrides/openstack/placement/tls.yaml index d77291e9c5..8f088425ca 100644 --- a/values_overrides/openstack/placement/tls.yaml +++ b/values_overrides/openstack/placement/tls.yaml @@ -27,9 +27,7 @@ placement: WSGIScriptAlias / /var/www/cgi-bin/placement/placement-api WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On - = 2.4> - ErrorLogFormat "%{cu}t %M" - + ErrorLogFormat "%{cu}t %M" ErrorLog /dev/stdout SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded CustomLog /dev/stdout combined env=!forwarded diff --git a/values_overrides/placement/tls.yaml b/values_overrides/placement/tls.yaml index 1d511395c9..7a346e0dac 100644 --- a/values_overrides/placement/tls.yaml +++ b/values_overrides/placement/tls.yaml @@ -28,9 +28,7 @@ conf: WSGIScriptAlias / /var/www/cgi-bin/placement/placement-api WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On - = 2.4> - ErrorLogFormat "%{cu}t %M" - + ErrorLogFormat "%{cu}t %M" SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded ErrorLog /dev/stdout CustomLog /dev/stdout combined env=!forwarded