--- doc/loncapafiles/webserver.piml	2002/01/29 10:32:44	1.1
+++ doc/loncapafiles/webserver.piml	2002/02/06 19:48:27	1.7
@@ -1,7 +1,7 @@
 <!-- webserver.piml -->
 <!-- Scott Harrison -->
 
-<!-- $Id: webserver.piml,v 1.1 2002/01/29 10:32:44 harris41 Exp $ -->
+<!-- $Id: webserver.piml,v 1.7 2002/02/06 19:48:27 harris41 Exp $ -->
 
 <!--
 
@@ -37,6 +37,10 @@ http://www.lon-capa.org/
 
 <piml>
 <targetroot>/</targetroot>
+<specialnotices>
+<specialnotice>
+</specialnotice>
+</specialnotices>
 <files>
 <file>
 <target dist='default'>/etc/httpd/conf/httpd.conf</target>
@@ -50,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==1) {
 	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==1) {
+	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==1) {
+	open OUT,"&gt;&gt;<TARGET />";
+	print OUT 'Include conf/loncapa.conf'."\n";
+	close OUT;
+  }
 }
 </perlscript>
 </file>
@@ -61,28 +93,64 @@ else {
 <target dist='default'>/etc/httpd/conf/access.conf</target>
 <note>This may or may not exist on a system depending on the version of
 Apache</note>
-<status>unverified</status>
 <dependencies dist='default'>
 /etc/httpd/conf/access.conf
 </dependencies>
 <perlscript mode='fg'>
+unless (-e "<TARGET />") {
+	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,
+* you have a newer version of Apache that does not
+  ordinarily install an access.conf
+* configuration files are installed in a directory location
+  different than for <TARGET />
+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==1) {
 open OUT,"&gt;&gt;<TARGET />";
-print OUT 'Include loncapa.conf'."\n";
+print OUT 'Include conf/loncapa.conf'."\n";
 close OUT;
+}
 </perlscript>
 </file>
 <file>
 <target dist='default'>/etc/httpd/conf/srm.conf</target>
 <note>This may or may not exist on a system depending on the version of
 Apache</note>
-<status>unverified</status>
 <dependencies dist='default'>
 /etc/httpd/conf/srm.conf
 </dependencies>
 <perlscript mode='fg'>
+unless (-e "<TARGET />") {
+	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,
+* you have a newer version of Apache that does not
+  ordinarily install an srm.conf
+* configuration files are installed in a directory location
+  different than for <TARGET />
+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==1) {
 open OUT,"&gt;&gt;<TARGET />";
-print OUT 'Include loncapa.conf'."\n";
+print OUT 'Include conf/loncapa.conf'."\n";
 close OUT;
+}
 </perlscript>
 </file>
 </files>