openstack/heat
Code Issues Proposed changes

Merge "Remove option for apache < 2.4"

Browse Source
This commit is contained in:
Zuul
2025-09-21 14:54:50 +00:00
committed by Gerrit Code Review
parent b2aa2df1a0 016e4e5cf1
commit 51d91d64e4
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
etc/heat/httpd/heat-api-cfn.conf
View File

@@ -7,9 +7,7 @@ Listen %PUBLICPORT%
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On WSGIPassAuthorization On
AllowEncodedSlashes On AllowEncodedSlashes On
<IfVersion >= 2.4> ErrorLogFormat "%{cu}t %M"
ErrorLogFormat "%{cu}t %M"
</IfVersion>
ErrorLog /var/log/%APACHE_NAME%/heat_api_cfn.log ErrorLog /var/log/%APACHE_NAME%/heat_api_cfn.log
CustomLog /var/log/%APACHE_NAME%/heat_api_cfn_access.log combined CustomLog /var/log/%APACHE_NAME%/heat_api_cfn_access.log combined
%SSLENGINE% %SSLENGINE%
@@ -17,12 +15,6 @@ Listen %PUBLICPORT%
%SSLKEYFILE% %SSLKEYFILE%
<Directory %HEAT_BIN_DIR%> <Directory %HEAT_BIN_DIR%>
<IfVersion >= 2.4> Require all granted
Require all granted
</IfVersion>
<IfVersion < 2.4>
Order allow,deny
Allow from all
</IfVersion>
</Directory> </Directory>
</VirtualHost> </VirtualHost>

12
etc/heat/httpd/heat-api.conf
View File

@@ -7,9 +7,7 @@ Listen %PUBLICPORT%
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On WSGIPassAuthorization On
AllowEncodedSlashes On AllowEncodedSlashes On
<IfVersion >= 2.4> ErrorLogFormat "%{cu}t %M"
ErrorLogFormat "%{cu}t %M"
</IfVersion>
ErrorLog /var/log/%APACHE_NAME%/heat_api.log ErrorLog /var/log/%APACHE_NAME%/heat_api.log
CustomLog /var/log/%APACHE_NAME%/heat_api_access.log combined CustomLog /var/log/%APACHE_NAME%/heat_api_access.log combined
%SSLENGINE% %SSLENGINE%
@@ -17,12 +15,6 @@ Listen %PUBLICPORT%
%SSLKEYFILE% %SSLKEYFILE%
<Directory %HEAT_BIN_DIR%> <Directory %HEAT_BIN_DIR%>
<IfVersion >= 2.4> Require all granted
Require all granted
</IfVersion>
<IfVersion < 2.4>
Order allow,deny
Allow from all
</IfVersion>
</Directory> </Directory>
</VirtualHost> </VirtualHost>