--- doc/loncapafiles/webserver.piml	2002/02/02 12:57:10	1.2
+++ doc/loncapafiles/webserver.piml	2002/02/05 01:43:24	1.5
@@ -1,7 +1,7 @@
 <!-- webserver.piml -->
 <!-- Scott Harrison -->
 
-<!-- $Id: webserver.piml,v 1.2 2002/02/02 12:57:10 harris41 Exp $ -->
+<!-- $Id: webserver.piml,v 1.5 2002/02/05 01:43:24 harris41 Exp $ -->
 
 <!--
 
@@ -54,10 +54,38 @@ unless (-e "<TARGET />") {
 		'software package';
 }
 else {
+  $flag=0;
+  open IN, "&lt;<TARGET />";
+  while (&lt;IN&gt;) { if (/^\s*Include\s+conf\/srm.conf/) { $flag=1; } }
+  close IN;
+  unless ($flag==0) {
 	open OUT,"&gt;&gt;<TARGET />";
-	print OUT 'Include srm.conf'."\n";
-	print OUT 'Include access.conf'."\n";
+	print OUT 'Include conf/srm.conf'."\n";
 	close OUT;
+  }
+  $flag=0;
+  open IN, "&lt;<TARGET />";
+  while (&lt;IN&gt;) { if (/^\s*Include\s+conf\/access.conf/) { $flag=1; } }
+  close IN;
+  unless ($flag==0) {
+	open OUT,"&gt;&gt;<TARGET />";
+	print OUT 'Include conf/access.conf'."\n";
+	close OUT;
+  }
+  $flag=0;
+  my $eflag=0;
+  open IN, "&lt;<TARGET />";
+  while (&lt;IN&gt;) { 
+    if (/^\s*Include\s+conf\/loncapa.conf/) {
+      $flag=1; 
+    }
+  }
+  close IN;
+  unless ($flag==0) {
+	open OUT,"&gt;&gt;<TARGET />";
+	print OUT 'Include conf/loncapa.conf'."\n";
+	close OUT;
+  }
 }
 </perlscript>
 </file>
@@ -70,7 +98,7 @@ Apache</note>
 </dependencies>
 <perlscript mode='fg'>
 unless (-e "<TARGET />") {
-	print &lt;&lt;;
+	print &lt;&lt;END
 WARNING! access.conf is not currently present on your system.
 This is either due to 
 * you are missing the Apache software package,
@@ -82,9 +110,15 @@ For backwards compatibility,
 <TARGET /> is being generated.
 END
 }
+my $flag=0;
+open IN, "&lt;<TARGET />";
+while (&lt;IN&gt;) { if (/^\s*Include\s+conf\/loncapa.conf/) { $flag=1; } }
+close IN;
+unless ($flag==0) {
 open OUT,"&gt;&gt;<TARGET />";
-print OUT 'Include loncapa.conf'."\n";
+print OUT 'Include conf/loncapa.conf'."\n";
 close OUT;
+}
 </perlscript>
 </file>
 <file>
@@ -96,7 +130,7 @@ Apache</note>
 </dependencies>
 <perlscript mode='fg'>
 unless (-e "<TARGET />") {
-	print &lt;&lt;;
+	print &lt;&lt;END
 WARNING! srm.conf is not currently present on your system.
 This is either due to 
 * you are missing the Apache software package,
@@ -108,9 +142,15 @@ For backwards compatibility,
 <TARGET /> is being generated.
 END
 }
+my $flag=0;
+open IN, "&lt;<TARGET />";
+while (&lt;IN&gt;) { if (/^\s*Include\s+conf\/loncapa.conf/) { $flag=1; } }
+close IN;
+unless ($flag==0) {
 open OUT,"&gt;&gt;<TARGET />";
-print OUT 'Include loncapa.conf'."\n";
+print OUT 'Include conf/loncapa.conf'."\n";
 close OUT;
+}
 </perlscript>
 </file>
 </files>