openstack-infra/puppet-odsreg
Code Issues Proposed changes

Fix paths in apache configuration

Browse Source 
Also add "Satisfy any" to make 2.4 happy.

Change-Id: Ie1e7007c0e2d90d8d83d91b97e4554b9daaba821
This commit is contained in:
James E. Blair 2015-09-17 21:51:07 -07:00
parent 89eeed1c46
commit de09adabf3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
templates/odsreg.vhost.erb
View File

@ -2,22 +2,25 @@
ServerName <%= scope.lookupvar("odsreg::vhost_name") %>
WSGIScriptAlias / /var/www/odsreg/django.wsgi
Alias /media/ /usr/local/odsreg/cfp/static/
Alias /media/ /usr/local/odsreg/odsreg/cfp/static/
Alias /static/admin/ /usr/share/pyshared/django/contrib/admin/media/
<Directory /usr/share/pyshared/django/contrib/admin/media>
Order deny,allow
Allow from all
Satisfy any
</Directory>
<Directory /usr/local/odsreg/cfp/static/>
<Directory /usr/local/odsreg/odsreg/cfp/static/>
Order deny,allow
Allow from all
Satisfy any
</Directory>
<Directory /var/www/odsreg>
Order deny,allow
Allow from all
Satisfy any
</Directory>
ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/odsreg_error.log