mirror of
https://opendev.org/openstack/heat.git
synced 2026-01-11 19:56:58 +00:00
Remove option for apache < 2.4
apache 2.4 was released long time ago and is now available in recent operating systems. Change-Id: I89d399c28cd3907dfda9a4ee8efb73f8316d1040 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
parent
7ffb5dd3c2
commit
016e4e5cf1
2 changed files with 4 additions and 20 deletions
|
|
@ -7,9 +7,7 @@ Listen %PUBLICPORT%
|
|||
WSGIApplicationGroup %{GLOBAL}
|
||||
WSGIPassAuthorization On
|
||||
AllowEncodedSlashes On
|
||||
<IfVersion >= 2.4>
|
||||
ErrorLogFormat "%{cu}t %M"
|
||||
</IfVersion>
|
||||
ErrorLogFormat "%{cu}t %M"
|
||||
ErrorLog /var/log/%APACHE_NAME%/heat_api_cfn.log
|
||||
CustomLog /var/log/%APACHE_NAME%/heat_api_cfn_access.log combined
|
||||
%SSLENGINE%
|
||||
|
|
@ -17,12 +15,6 @@ Listen %PUBLICPORT%
|
|||
%SSLKEYFILE%
|
||||
|
||||
<Directory %HEAT_BIN_DIR%>
|
||||
<IfVersion >= 2.4>
|
||||
Require all granted
|
||||
</IfVersion>
|
||||
<IfVersion < 2.4>
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</IfVersion>
|
||||
Require all granted
|
||||
</Directory>
|
||||
</VirtualHost>
|
||||
|
|
|
|||
|
|
@ -7,9 +7,7 @@ Listen %PUBLICPORT%
|
|||
WSGIApplicationGroup %{GLOBAL}
|
||||
WSGIPassAuthorization On
|
||||
AllowEncodedSlashes On
|
||||
<IfVersion >= 2.4>
|
||||
ErrorLogFormat "%{cu}t %M"
|
||||
</IfVersion>
|
||||
ErrorLogFormat "%{cu}t %M"
|
||||
ErrorLog /var/log/%APACHE_NAME%/heat_api.log
|
||||
CustomLog /var/log/%APACHE_NAME%/heat_api_access.log combined
|
||||
%SSLENGINE%
|
||||
|
|
@ -17,12 +15,6 @@ Listen %PUBLICPORT%
|
|||
%SSLKEYFILE%
|
||||
|
||||
<Directory %HEAT_BIN_DIR%>
|
||||
<IfVersion >= 2.4>
|
||||
Require all granted
|
||||
</IfVersion>
|
||||
<IfVersion < 2.4>
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</IfVersion>
|
||||
Require all granted
|
||||
</Directory>
|
||||
</VirtualHost>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue