--- doc/loncapafiles/webserver.piml	2003/01/07 19:01:58	1.12
+++ doc/loncapafiles/webserver.piml	2004/08/23 19:07:26	1.16
@@ -1,9 +1,8 @@
 <!DOCTYPE piml PUBLIC "-//TUX/DTD piml 1.0 Final//EN" 
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- webserver.piml -->
-<!-- Scott Harrison -->
 
-<!-- $Id: webserver.piml,v 1.12 2003/01/07 19:01:58 harris41 Exp $ -->
+<!-- $Id: webserver.piml,v 1.16 2004/08/23 19:07:26 matthew Exp $ -->
 
 <!--
 
@@ -53,8 +52,8 @@ http://www.lon-capa.org/
 <perlscript mode='fg'>
 # Generated from doc/loncapafiles/webserver.piml
 unless (-e "<TARGET />") {
-  print 'ERROR! httpd.conf should exist! Are you missing the Apache '.
-    'software package';
+  print '**** ERROR! httpd.conf should exist! Are you missing the Apache '.
+    'software package?';
   exit(1);
 }
 else {
@@ -94,6 +93,55 @@ else {
   }
 }
 </perlscript>
+</file>
+<file>
+<target dist='default'>/etc/httpd/conf/httpd.conf</target>
+<note>This is always expected for any version of Apache</note>
+<dependencies dist='default'>
+/etc/httpd/conf/httpd.conf
+</dependencies>
+<perlscript mode='fg'>
+# Generated from doc/loncapafiles/webserver.piml
+# Trying to check for overlapping DocumentRoot or ScriptAlias definitions.
+unless (-e "<TARGET />") {
+  print '**** ERROR **** httpd.conf should exist! Are you missing the Apache '.
+    'software package?';
+  exit(1);
+}
+else {
+  # Append loncapa_apache.conf inclusion to httpd.conf if not present.
+  $scriptalias_flag=0;
+  $documentroot_flag=0;
+  my $scriptalias;
+  my $documentroot;
+  open(IN,'&lt;<TARGET />');
+  while (&lt;IN&gt;) { 
+    if (m!^\s*ScriptAlias\s+/cgi-bin/\s+(.*)$!) {
+      $scriptalias = $1;
+      if ($scriptalias !~ m!home/httpd/cgi-bin!) {
+	$scriptalias_flag = 1;
+      }
+    }
+    if (m!^\s*DocumentRoot\s+(.*)$!) {
+      $documentroot = $1;
+      if ($documentroot !~ m!home/httpd/html!) {
+	$documentroot_flag = 1;
+      }
+    }
+  }
+  close(IN);
+  if ($scriptalias_flag==1) {
+    print('**** ERROR **** httpd.conf has an overlapping definition of '.
+          'ScriptAlias (it is incorrectly set to '.$scriptalias.').'."\n".
+	  'This conflicts with loncapa_apache.conf.'."\n");
+  }
+  if ($documentroot_flag==1) {
+    print('**** ERROR **** httpd.conf has an overlapping definition of '.
+          'DocumentRoot (it is incorrectly set to '.$documentroot.').'."\n".
+	  'This conflicts with loncapa_apache.conf.'."\n");
+  }
+}
+</perlscript>
 </file>
 </files>
 </piml>