[LON-CAPA-cvs] cvs: doc /loncapafiles loncapafiles.lpml loncom loncapa_apache.conf loncom/interface createaccount.pm

[raeburn]

raeburn		Tue Jul  8 13:52:37 2008 EDT

  Modified files:              
    /loncom/interface	createaccount.pm 
    /loncom	loncapa_apache.conf 
    /doc/loncapafiles	loncapafiles.lpml 
  Log:
  - Store captcha image and captcha code in lonCaptchaDir and lonCaptchaDb 
     respectively.
  - Entry in loncapafiles.lpml to create necessary directories during install.
  
  
Index: loncom/interface/createaccount.pm
diff -u loncom/interface/createaccount.pm:1.12 loncom/interface/createaccount.pm:1.13
--- loncom/interface/createaccount.pm:1.12	Tue Jul  8 13:47:57 2008
+++ loncom/interface/createaccount.pm	Tue Jul  8 13:52:16 2008
@@ -3,7 +3,7 @@
 # institutional log-in ID (institutional authentication required - localauth
 #  or kerberos) or an e-mail address.
 #
-# $Id: createaccount.pm,v 1.12 2008/07/08 17:47:57 raeburn Exp $
+# $Id: createaccount.pm,v 1.13 2008/07/08 17:52:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -939,9 +939,9 @@
 
 sub captcha_settings {
     my %captcha_params = ( 
-                           output_dir     => $Apache::lonnet::perlvar{'lonDocRoot'}.'/captcha',
-                           www_output_dir => "/captcha",
-                           db_dir         => "/home/www/captchadb",
+                           output_dir     => $Apache::lonnet::perlvar{'lonCaptchaDir'},
+                           www_output_dir => "/captchaspool",
+                           db_dir         => $Apache::lonnet::perlvar{'lonCaptchaDb'},
                            numchars       => '5',
                          );
     return %captcha_params;
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.176 loncom/loncapa_apache.conf:1.177
--- loncom/loncapa_apache.conf:1.176	Mon May 19 13:15:13 2008
+++ loncom/loncapa_apache.conf	Tue Jul  8 13:52:32 2008
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.176 2008/05/19 17:15:13 raeburn Exp $
+## $Id: loncapa_apache.conf,v 1.177 2008/07/08 17:52:32 raeburn Exp $
 ##
 
 #
@@ -37,6 +37,7 @@
 
 Alias /zipspool/ /home/httpd/zipspool/
 Alias /prtspool/ /home/httpd/prtspool/
+Alias /captchaspool/ /home/httpd/captchaspool/
 ScriptAlias /cgi-bin/ "/home/httpd/cgi-bin/"
 
 # ================================================================= Directories
@@ -1375,6 +1376,15 @@
 allow from all
 </Directory>
 
+# Allow serving of files in captchaspool
+
+<Directory "/home/httpd/captchaspool/">
+Options Includes FollowSymLinks
+AllowOverride None
+order allow,deny
+allow from all
+</Directory>
+
 # ============================================================= Access Handlers
 
 # ------------------------------------------------- Allow server-status reports
@@ -1420,6 +1430,8 @@
 PerlSetVar       lonPrtDir    /home/httpd/prtspool
 PerlSetVar       lonIncludes  /home/httpd/html/res/adm/includes
 PerlSetVar       lonZipDir    /home/httpd/zipspool
+PerlSetVar       lonCaptchaDir     /home/httpd/captchaspool
+PerlSetVar       lonCaptchaDb     /home/httpd/captchadb 
 PerlSetVar       lonFontsDir     /home/httpd/html/adm/fonts
 # & separated list of : separated fields in order of
 # - internal name to call it, 
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.594 doc/loncapafiles/loncapafiles.lpml:1.595
--- doc/loncapafiles/loncapafiles.lpml:1.594	Tue Jul  8 09:57:28 2008
+++ doc/loncapafiles/loncapafiles.lpml	Tue Jul  8 13:52:36 2008
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.594 2008/07/08 13:57:28 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.595 2008/07/08 17:52:36 raeburn Exp $ -->
 
 <!--
 
@@ -363,6 +363,18 @@
 </directory>
 <directory dist='default'>
   <protectionlevel>modest_delete</protectionlevel>
+  <targetdir dist='default'>home/httpd/captchaspool</targetdir>
+  <categoryname>server standard</categoryname>
+  <description>for temporary storage of Captcha images</description>
+</directory>
+<directory dist='default'>
+  <protectionlevel>modest_delete</protectionlevel>
+  <targetdir dist='default'>home/httpd/captchadb</targetdir>
+  <categoryname>server standard</categoryname>
+  <description>for temporary storage of Captcha codes</description>
+</directory>
+<directory dist='default'>
+  <protectionlevel>modest_delete</protectionlevel>
   <targetdir dist='default'>home/httpd/lib</targetdir>
   <categoryname>server readonly</categoryname>
   <description>location of LON-CAPA software modules and
@@ -645,7 +657,6 @@
   <categoryname>server readonly</categoryname>
   <description>unauthenticated resources</description>
 </directory>
-
 <directory dist='default'>
   <protectionlevel>never_delete</protectionlevel>
   <targetdir dist='default'>home/httpd/lonUsers</targetdir>