From de09adabf3bb658d7c29a58f0652358adb60996e Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@linux.vnet.ibm.com>
Date: Thu, 17 Sep 2015 21:51:07 -0700
Subject: [PATCH] Fix paths in apache configuration

Also add "Satisfy any" to make 2.4 happy.

Change-Id: Ie1e7007c0e2d90d8d83d91b97e4554b9daaba821
---
 templates/odsreg.vhost.erb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/templates/odsreg.vhost.erb b/templates/odsreg.vhost.erb
index 2da60ce..80b3d4f 100644
--- a/templates/odsreg.vhost.erb
+++ b/templates/odsreg.vhost.erb
@@ -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