[LON-CAPA-cvs] cvs: doc /loncapafiles buildfiles.lpml reseval_fixup.piml webserver.piml

[www]

www		Tue Feb 10 15:54:14 2004 EDT

  Modified files:              
    /doc/loncapafiles	buildfiles.lpml reseval_fixup.piml webserver.piml 
  Log:
  * the postinstall scripts did probably not run on a number of servers, since
  the non-consequential "error" of DocumentRoot being set twice prevented the
  whole rest of the scripts from running
  * made it so that the error does not stop postinstall
  * since a number of machines might now have both nohist_resevalhist.db and
  resevalhist.db, made sure to not destroy the new data by pasting over it
  * if we get ambitious, we can merge the two files from the hist-file
  
  
Index: doc/loncapafiles/buildfiles.lpml
diff -u doc/loncapafiles/buildfiles.lpml:1.8 doc/loncapafiles/buildfiles.lpml:1.9
--- doc/loncapafiles/buildfiles.lpml:1.8	Tue Dec  9 15:17:48 2003
+++ doc/loncapafiles/buildfiles.lpml	Tue Feb 10 15:54:14 2004
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- buildfiles.lpml -->
 
-<!-- $Id: buildfiles.lpml,v 1.8 2003/12/09 20:17:48 matthew Exp $ -->
+<!-- $Id: buildfiles.lpml,v 1.9 2004/02/10 20:54:14 www Exp $ -->
 
 <!--
 
@@ -189,6 +189,16 @@
 <categoryname>system file</categoryname>
 <description>
 Checks LON-CAPA system for sendmail permissions error.
+</description>
+<note>
+</note>
+</file>
+<file>
+<source>doc/loncapafiles/ownership_fix.piml</source>
+<target dist='default'>ownership_fix.piml</target>
+<categoryname>system file</categoryname>
+<description>
+Makes sure that /home/httpd/lonUsers and /home/httpd/html are owned by www.
 </description>
 <note>
 </note>
Index: doc/loncapafiles/reseval_fixup.piml
diff -u doc/loncapafiles/reseval_fixup.piml:1.4 doc/loncapafiles/reseval_fixup.piml:1.5
--- doc/loncapafiles/reseval_fixup.piml:1.4	Thu Aug 15 11:41:57 2002
+++ doc/loncapafiles/reseval_fixup.piml	Tue Feb 10 15:54:14 2004
@@ -3,7 +3,7 @@
 <!-- reseval_fixup.piml -->
 <!-- Guy Albertelli -->
 
-<!-- $Id: reseval_fixup.piml,v 1.4 2002/08/15 15:41:57 harris41 Exp $ -->
+<!-- $Id: reseval_fixup.piml,v 1.5 2004/02/10 20:54:14 www Exp $ -->
 
 <!--
 
@@ -40,11 +40,13 @@
 my @userdirs=grep(m|/[^/]*/[^/]*/[^/]*/[^/]*/[^/]*/[^/]*/[^/]*/[^/]*|, @dirs);
 foreach my $udir (@userdirs) {
   chomp($udir);
-  if (-e "$udir/resevaldata.hist") {
-    unlink("$udir/resevaldata.hist");
-  }
-  if (-e "$udir/resevaldata.db") {
-    `mv $udir/resevaldata.db $udir/nohist_resevaldata.db`;
+  unless (-e "$udir/nohist_resevaldata.db") {	
+     if (-e "$udir/resevaldata.db") {
+        `mv $udir/resevaldata.db $udir/nohist_resevaldata.db`;
+     }
+     if (-e "$udir/resevaldata.hist") {
+        unlink("$udir/resevaldata.hist");
+     }
   }
 }
 </perlscript>
Index: doc/loncapafiles/webserver.piml
diff -u doc/loncapafiles/webserver.piml:1.14 doc/loncapafiles/webserver.piml:1.15
--- doc/loncapafiles/webserver.piml:1.14	Mon Feb  3 13:03:51 2003
+++ doc/loncapafiles/webserver.piml	Tue Feb 10 15:54:14 2004
@@ -2,7 +2,7 @@
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- webserver.piml -->
 
-<!-- $Id: webserver.piml,v 1.14 2003/02/03 18:03:51 harris41 Exp $ -->
+<!-- $Id: webserver.piml,v 1.15 2004/02/10 20:54:14 www Exp $ -->
 
 <!--
 
@@ -139,9 +139,6 @@
     print('**** ERROR **** httpd.conf has an overlapping definition of '.
           'DocumentRoot (it is incorrectly set to '.$documentroot.').'."\n".
 	  'This conflicts with loncapa_apache.conf.'."\n");
-  }
-  if ($documentroot_flag==1 or $scriptalias_flag==1) {
-    exit(1);
   }
 }
 </perlscript>