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

[raeburn]

raeburn		Tue Feb 28 15:14:25 2012 EDT

  Modified files:              
    /loncom	loncapa_apache.conf 
  Log:
  - Apache should start if mod_ssl is not installed, but no webDAV access.
  
  
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.210 loncom/loncapa_apache.conf:1.211
--- loncom/loncapa_apache.conf:1.210	Mon Feb 27 03:06:37 2012
+++ loncom/loncapa_apache.conf	Tue Feb 28 15:14:25 2012
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.210 2012/02/27 03:06:37 raeburn Exp $
+## $Id: loncapa_apache.conf,v 1.211 2012/02/28 15:14:25 raeburn Exp $
 ##
 
 #
@@ -272,19 +272,27 @@
 </LocationMatch>
 
 <LocationMatch "^/+webdav/[\w\-]+/[\w\-]+/">
-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 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>
 </LocationMatch>
 
 <LocationMatch "^/+raw.*">