From 6ba18711b7d25f7dc3a011786d58e7e8edcc149f Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Mon, 26 Nov 2007 07:54:29 +0000
Subject: [PATCH] put the authentication configuration inside the <Directory>
 block to provide a complete set of information to the webserver. fixes #12

---
 setup/davadmin.vhost | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/setup/davadmin.vhost b/setup/davadmin.vhost
index a4dcab0..7657ce2 100644
--- a/setup/davadmin.vhost
+++ b/setup/davadmin.vhost
@@ -1,5 +1,5 @@
 <VirtualHost 127.0.0.1:80>
-  ServerAdmin jan@davhost.example.com
+  ServerAdmin admin@davhost.example.com
   ServerName davhost.example.com
 
   DavLockDb /var/run/apache2/davlock/davhost.example.com
@@ -12,6 +12,16 @@
     AllowOverride AuthConfig Indexes
     Order Allow,Deny
     allow from all
+
+    AuthType Digest
+    AuthName "WebDAV on davhost.example.com"
+    AuthDigestDomain /dav/ 
+    
+    AuthDigestProvider file
+    AuthUserFile /var/www/auth/dav.htdigest
+    AuthGroupFile /var/www/auth/dav.groups
+
+    require valid-user
   </Directory>
 
   <Location /davadmin>
@@ -26,16 +36,6 @@
     require valid-user
   </Location>
 
-  <Location /dav/>
-    AuthType Digest
-    AuthName "WebDAV on davhost.example.com"
-    AuthDigestDomain /dav/ 
-    
-    AuthDigestProvider file
-    AuthUserFile /var/www/auth/dav.htdigest
-    AuthGroupFile /var/www/auth/dav.groups
-  </Location>
-
   ErrorLog /var/log/apache2/davhost.example.com_error.log
   LogLevel warn
   CustomLog /var/log/apache2/davhost.example.com_access.log combined