[LON-CAPA-cvs] cvs: loncom / loncapa_apache.conf

[raeburn]

raeburn		Sun Mar 18 21:56:53 2012 EDT

  Modified files:              
    /loncom	loncapa_apache.conf 
  Log:
  - Apache should start if mod_dav and mod_dav_fs modules are not loaded,
    no webDAV though.  
  
  
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.213 loncom/loncapa_apache.conf:1.214
--- loncom/loncapa_apache.conf:1.213	Tue Mar  6 00:53:51 2012
+++ loncom/loncapa_apache.conf	Sun Mar 18 21:56:53 2012
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.213 2012/03/06 00:53:51 raeburn Exp $
+## $Id: loncapa_apache.conf,v 1.214 2012/03/18 21:56:53 raeburn Exp $
 ##
 
 #
@@ -40,7 +40,9 @@
 Alias /captchaspool/ /home/httpd/captchaspool/
 Alias /webdav/ /home/httpd/html/priv/
 ScriptAlias /cgi-bin/ "/home/httpd/cgi-bin/"
-DAVLockDB /home/httpd/webdav/DAVLock
+<IfModule mod_dav_fs.c>
+    DAVLockDB /home/httpd/webdav/DAVLock
+</IfModule>
 
 # ================================================================= Directories
 
@@ -278,25 +280,33 @@
 </LocationMatch>
 
 <LocationMatch "^/+webdav/[\w\-]+/[\w\-]+/">
-  <IfModule mod_ssl.c>
-    AuthType Basic
-    AuthName "LONCAPA username,domain"
-    Require valid-user
-    SSLRequireSSL
-    PerlAuthenHandler Apache::lonwebdavauth
-    PerlAuthzHandler Apache::lonwebdavacc
-    Dav On
-    DirectoryIndex index.missing
-    Options Indexes FollowSymLinks
-    ErrorDocument     403 /adm/nowebdav.html
-    ErrorDocument     404 /adm/notfound.html
-    ErrorDocument     406 /adm/unauthorized
-    ErrorDocument     500 /adm/errorhandler
-  </IfModule>
-  <IfModule !mod_ssl.c>
-    <IfModule mod_rewrite.c>
+  <IfModule mod_dav.c>
+    <IfModule mod_ssl.c>
+      AuthType Basic
+      AuthName "LONCAPA username,domain"
+      Require valid-user
+      SSLRequireSSL
+      PerlAuthenHandler Apache::lonwebdavauth
+      PerlAuthzHandler Apache::lonwebdavacc
+      Dav On
+      DirectoryIndex index.missing
+      Options Indexes FollowSymLinks
+      ErrorDocument     403 /adm/nowebdav.html
+      ErrorDocument     404 /adm/notfound.html
+      ErrorDocument     406 /adm/unauthorized
+      ErrorDocument     500 /adm/errorhandler
+    </IfModule>
+    <IfModule !mod_ssl.c>
+      <IfModule mod_rewrite.c>
         RewriteEngine on
         RewriteRule .* http://%{HTTP_HOST}/adm/nowebdav.html [L]
+      </IfModule>
+    </IfModule>
+  </IfModule>
+  <IfModule !mod_dav.c>
+    <IfModule mod_rewrite.c>
+      RewriteEngine on
+      RewriteRule .* http://%{HTTP_HOST}/adm/nowebdav.html [L]
     </IfModule>
   </IfModule>
 </LocationMatch>