--- doc/loncapafiles/webserver.piml	2002/01/29 10:32:44	1.1
+++ doc/loncapafiles/webserver.piml	2003/01/13 22:01:32	1.13
@@ -1,7 +1,9 @@
+<!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.1 2002/01/29 10:32:44 harris41 Exp $ -->
+<!-- $Id: webserver.piml,v 1.13 2003/01/13 22:01:32 harris41 Exp $ -->
 
 <!--
 
@@ -37,6 +39,10 @@ http://www.lon-capa.org/
 
 <piml>
 <targetroot>/</targetroot>
+<specialnotices>
+<specialnotice>
+</specialnotice>
+</specialnotices>
 <files>
 <file>
 <target dist='default'>/etc/httpd/conf/httpd.conf</target>
@@ -45,44 +51,100 @@ http://www.lon-capa.org/
 /etc/httpd/conf/httpd.conf
 </dependencies>
 <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 {
-	open OUT,"&gt;&gt;<TARGET />";
-	print OUT 'Include srm.conf'."\n";
-	print OUT 'Include access.conf'."\n";
-	close OUT;
+  # Append loncapa_apache.conf inclusion to httpd.conf if not present.
+  $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);
+  }
+  # Remove loncapa.conf inclusion from httpd.conf if present.
+  $flag=0;
+  open(IN,'&lt;<TARGET />');
+  while (&lt;IN&gt;) {
+    if (/^\s*Include\s+conf\/loncapa.conf/) {
+      $flag=1;
+    }
+  }
+  close(IN);
+  $in='';
+  if ($flag==1) {
+    open(IN,'&lt;<TARGET />');
+    while(&lt;IN&gt;) {
+      $in.=$_ unless /^\s*Include\s+conf\/loncapa.conf/;
+    }
+    close(IN);
+    open(OUT,'&gt;<TARGET />');
+    print(OUT $in."\n");
+    close(OUT);
+  }
 }
 </perlscript>
 </file>
 <file>
-<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'>
-open OUT,"&gt;&gt;<TARGET />";
-print OUT 'Include 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>
+<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/srm.conf
+/etc/httpd/conf/httpd.conf
 </dependencies>
 <perlscript mode='fg'>
-open OUT,"&gt;&gt;<TARGET />";
-print OUT 'Include loncapa.conf'."\n";
-close OUT;
+# 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");
+  }
+  if ($documentroot_flag==1 or $scriptalias_flag==1) {
+    exit(1);
+  }
+}
 </perlscript>
 </file>
 </files>