openstack/devstack
Code Issues Proposed changes

Remove option for apache < 2.4

Browse Source 
apache 2.4 was released long time ago and is now available in recent
operating systems.

Change-Id: If367869e8490159f31c7d6c0207e182dd7ecb164
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-21 03:12:55 +09:00
parent 63d874e4af
commit e4cb49c690
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 WSGIScriptAlias / %CINDER_BIN_DIR%/cinder-wsgi
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On WSGIPassAuthorization On
<IfVersion >= 2.4> ErrorLogFormat "%{cu}t %M"
ErrorLogFormat "%{cu}t %M"
</IfVersion>
ErrorLog /var/log/%APACHE_NAME%/c-api.log ErrorLog /var/log/%APACHE_NAME%/c-api.log
%SSLENGINE% %SSLENGINE%
%SSLCERTFILE% %SSLCERTFILE%
%SSLKEYFILE% %SSLKEYFILE%
<Directory %CINDER_BIN_DIR%> <Directory %CINDER_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>

14
files/apache-horizon.template
View File

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

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

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