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

[harris41]

harris41		Sun May 12 15:02:18 2002 EDT

  Modified files:              
    /doc/loncapafiles	webserver.piml 
  Log:
  BUG 129
  regarding split of loncapa.conf into
  loncapa_apache.conf and loncapa.conf
  
  
Index: doc/loncapafiles/webserver.piml
diff -u doc/loncapafiles/webserver.piml:1.8 doc/loncapafiles/webserver.piml:1.9
--- doc/loncapafiles/webserver.piml:1.8	Sun Apr 14 16:34:32 2002
+++ doc/loncapafiles/webserver.piml	Sun May 12 15:02:18 2002
@@ -3,7 +3,7 @@
 <!-- webserver.piml -->
 <!-- Scott Harrison -->
 
-<!-- $Id: webserver.piml,v 1.8 2002/04/14 20:34:32 harris41 Exp $ -->
+<!-- $Id: webserver.piml,v 1.9 2002/05/12 19:02:18 harris41 Exp $ -->
 
 <!--
 
@@ -74,8 +74,21 @@
 	print OUT 'Include conf/access.conf'."\n";
 	close OUT;
   }
-  $flag=0;
   my $eflag=0;
+  $flag=0;
+  open IN, "&lt;<TARGET />";
+  while (&lt;IN&gt;) { 
+    if (/^\s*Include\s+conf\/loncapa_apache.conf/) {
+      $flag=1; 
+    }
+  }
+  close IN;
+  unless ($flag==1) {
+	open OUT,"&gt;&gt;<TARGET />";
+	print OUT 'Include conf/loncapa_apache.conf'."\n";
+	close OUT;
+  }
+  $flag=0;
   open IN, "&lt;<TARGET />";
   while (&lt;IN&gt;) { 
     if (/^\s*Include\s+conf\/loncapa.conf/) {
@@ -114,6 +127,15 @@
 }
 my $flag=0;
 open IN, "&lt;<TARGET />";
+while (&lt;IN&gt;) { if (/^\s*Include\s+conf\/loncapa_apache.conf/)
+	 { $flag=1; } }
+close IN;
+unless ($flag==1) {
+open OUT,"&gt;&gt;<TARGET />";
+print OUT 'Include conf/loncapa_apache.conf'."\n";
+close OUT;
+$flag=0;
+open IN, "&lt;<TARGET />";
 while (&lt;IN&gt;) { if (/^\s*Include\s+conf\/loncapa.conf/) { $flag=1; } }
 close IN;
 unless ($flag==1) {
@@ -145,6 +167,15 @@
 END
 }
 my $flag=0;
+open IN, "&lt;<TARGET />";
+while (&lt;IN&gt;) { if (/^\s*Include\s+conf\/loncapa_apache.conf/)
+ { $flag=1; } }
+close IN;
+unless ($flag==1) {
+open OUT,"&gt;&gt;<TARGET />";
+print OUT 'Include conf/loncapa_apache.conf'."\n";
+close OUT;
+$flag=0;
 open IN, "&lt;<TARGET />";
 while (&lt;IN&gt;) { if (/^\s*Include\s+conf\/loncapa.conf/) { $flag=1; } }
 close IN;