openstack/devstack
Code Issues Proposed changes

Merge "Remove option for apache < 2.4"

Browse Source
This commit is contained in:
Zuul
2025-12-17 20:36:38 +00:00
committed by Gerrit Code Review
parent f755f3ffe3 e4cb49c690
commit 520e144c1b
4 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
files/apache-cinder-api.template
View File

@@ -6,21 +6,13 @@ Listen %PUBLICPORT%
WSGIScriptAlias / %CINDER_BIN_DIR%/cinder-wsgi
WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M"
</IfVersion>
ErrorLogFormat "%{cu}t %M"
ErrorLog /var/log/%APACHE_NAME%/c-api.log
%SSLENGINE%
%SSLCERTFILE%
%SSLKEYFILE%
<Directory %CINDER_BIN_DIR%>
<IfVersion >= 2.4>
Require all granted
</IfVersion>
<IfVersion < 2.4>
Order allow,deny
Allow from all
</IfVersion>
Require all granted
</Directory>
</VirtualHost>

14
files/apache-horizon.template
View File

@@ -21,19 +21,9 @@
<Directory %HORIZON_DIR%/>
Options Indexes FollowSymLinks MultiViews
AllowOverride None
# Apache 2.4 uses mod_authz_host for access control now (instead of
# "Allow")
<IfVersion < 2.4>
Order allow,deny
Allow from all
</IfVersion>
<IfVersion >= 2.4>
Require all granted
</IfVersion>
Require all granted
</Directory>
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M"
</IfVersion>
ErrorLogFormat "%{cu}t %M"
ErrorLog /var/log/%APACHE_NAME%/horizon_error.log
LogLevel warn
CustomLog /var/log/%APACHE_NAME%/horizon_access.log combined

4
files/apache-nova-api.template
View File

@@ -6,9 +6,7 @@ Listen %PUBLICPORT%
WSGIScriptAlias / %PUBLICWSGI%
WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On
<IfVersion >= 2.4>
ErrorLogFormat "%M"
</IfVersion>
ErrorLogFormat "%M"
ErrorLog /var/log/%APACHE_NAME%/nova-api.log
%SSLENGINE%
%SSLCERTFILE%

4
files/apache-nova-metadata.template
View File

@@ -6,9 +6,7 @@ Listen %PUBLICPORT%
WSGIScriptAlias / %PUBLICWSGI%
WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On
<IfVersion >= 2.4>
ErrorLogFormat "%M"
</IfVersion>
ErrorLogFormat "%M"
ErrorLog /var/log/%APACHE_NAME%/nova-metadata.log
%SSLENGINE%
%SSLCERTFILE%