opendev/system-config
Code Issues Proposed changes

Add Apache 2.4 syntax for static.o.o

Browse Source 
Change-Id: I0d5375ca3e64f846b4625175a6a73a66605015cd
This commit is contained in:
Elizabeth K. Joseph
2016-07-01 14:47:51 -07:00
parent 01933b3a61
commit 5fe2d96c97
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/openstack_project/templates/static-http-and-https.vhost.erb
View File

@@ -26,18 +26,16 @@
<Directory <%= dirname %>> <Directory <%= dirname %>>
Options Indexes FollowSymLinks MultiViews Options Indexes FollowSymLinks MultiViews
AllowOverride None AllowOverride None
Order allow,deny
allow from all
Satisfy Any Satisfy Any
Require all granted
</Directory> </Directory>
<% end -%> <% end -%>
<% else -%> <% else -%>
<Directory <%= @docroot %>> <Directory <%= @docroot %>>
Options Indexes FollowSymLinks MultiViews Options Indexes FollowSymLinks MultiViews
AllowOverride None AllowOverride None
Order allow,deny
allow from all
Satisfy Any Satisfy Any
Require all granted
</Directory> </Directory>
<% end -%> <% end -%>
LogLevel warn LogLevel warn
@@ -65,9 +63,8 @@
<Directory <%= @docroot %>> <Directory <%= @docroot %>>
Options Indexes FollowSymLinks MultiViews Options Indexes FollowSymLinks MultiViews
AllowOverride None AllowOverride None
Order allow,deny
allow from all
Satisfy Any Satisfy Any
Require all granted
</Directory> </Directory>
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/<%= @vhost_name %>_error.log ErrorLog /var/log/apache2/<%= @vhost_name %>_error.log

3
modules/openstack_project/templates/static-https-redirect.vhost.erb
View File

@@ -36,9 +36,8 @@
<Directory <%= @docroot %>> <Directory <%= @docroot %>>
Options Indexes FollowSymLinks MultiViews Options Indexes FollowSymLinks MultiViews
AllowOverride None AllowOverride None
Order allow,deny
allow from all
Satisfy Any Satisfy Any
Require all granted
</Directory> </Directory>
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/<%= @vhost_name %>_error.log ErrorLog /var/log/apache2/<%= @vhost_name %>_error.log