--- doc/loncapafiles/webserver.piml	2002/05/16 01:22:38	1.11
+++ doc/loncapafiles/webserver.piml	2005/10/10 02:30:46	1.18
@@ -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.11 2002/05/16 01:22:38 harris41 Exp $ -->
+<!-- $Id: webserver.piml,v 1.18 2005/10/10 02:30:46 raeburn Exp $ -->
 
 <!--
 
@@ -46,37 +45,19 @@ http://www.lon-capa.org/
 <files>
 <file>
 <target dist='default'>/etc/httpd/conf/httpd.conf</target>
-<note>This is always expected for any version of Apache</note>
+<note>This is for Apache 1.X for Red Hat and Fedora distributions</note>
 <dependencies dist='default'>
 /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! /etc/httpd/conf/httpd.conf should exist! Are you missing the Apache '.
+    'software package?';
   exit(1);
 }
 else {
-  $flag=0;
-  open IN, "&lt;<TARGET />";
-  while (&lt;IN&gt;) { if (/^\s*Include\s+conf\/srm.conf/) { $flag=1; } }
-  close IN;
-  if ($flag!=1 and -e '/etc/httpd/conf/srm.conf') {
-    open OUT,"&gt;&gt;<TARGET />";
-    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;
-  if ($flag!=1 and -e '/etc/httpd/conf/access.conf') {
-    open(OUT,'&gt;&gt;<TARGET />');
-    print(OUT 'Include conf/access.conf'."\n");
-    close(OUT);
-  }
-  my $eflag=0;
+  # Append loncapa_apache.conf inclusion to httpd.conf if not present.
   $flag=0;
   open(IN,'&lt;<TARGET />');
   while (&lt;IN&gt;) { 
@@ -90,6 +71,7 @@ else {
     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;) {
@@ -109,59 +91,56 @@ else {
     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>
-<dependencies dist='default'>
-/etc/httpd/conf/access.conf
-</dependencies>
-<perlscript mode='fg'>
-if (-e '<TARGET />') {
-  my $flag=0;
+
+# Checking for overlapping ScriptAlias and DocumentRoot definitions.
+  $scriptalias_flag=0;
+  $documentroot_flag=0;
+  my $scriptalias;
+  my $documentroot;
   open(IN,'&lt;<TARGET />');
   while (&lt;IN&gt;) {
-    if (/^\s*Include\s+conf\/loncapa_apache.conf/) {
-      $flag=1;
+    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);
-  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);
-  $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);
+  if ($scriptalias_flag==1) {
+    print('**** ERROR **** /etc/httpd/conf/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 **** /etc/httpd/conf/httpd.conf has an overlapping definition of '.
+          'DocumentRoot (it is incorrectly set to '.$documentroot.').'."\n".
+          'This conflicts with loncapa_apache.conf.'."\n");
   }
 }
 </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>
-<dependencies dist='default'>
-/etc/httpd/conf/srm.conf
+<target dist='suse9.2 suse9.3 sles9'>/etc/httpd/httpd.conf</target>
+<note>This is for Apache 1.X for SuSE distributions</note>
+<dependencies dist='suse9.2 suse9.3 sles9'>
+/etc/httpd/httpd.conf
 </dependencies>
-<perlscript mode='fg'>
-if (-e '<TARGET />') {
-  my $flag=0;
+<perlscript mode='fg' dist='suse9.2 suse9.3 sles9'>
+# Generated from doc/loncapafiles/webserver.piml
+# Trying to check for overlapping DocumentRoot or ScriptAlias definitions.
+unless (-e "<TARGET />") {
+  print '**** ERROR **** /etc/httpd/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.
+  $flag=0;
   open(IN,'&lt;<TARGET />');
   while (&lt;IN&gt;) {
     if (/^\s*Include\s+conf\/loncapa_apache.conf/) {
@@ -174,6 +153,7 @@ if (-e '<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;) {
@@ -193,6 +173,38 @@ if (-e '<TARGET />') {
     print(OUT $in."\n");
     close(OUT);
   }
+
+  # Checking for overlapping ScriptAlias and DocumentRoot definitions.
+  $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 **** /etc/httpd/httpd.conf has an overlapping definition of '.
+          'ScriptAlias (it is incorrectly set to '.$scriptalias.').'."\n".
+	  'This conflicts with conf/loncapa_apache.conf.'."\n");
+  }
+  if ($documentroot_flag==1) {
+    print('**** ERROR **** /etc/httpd/httpd.conf has an overlapping definition of '.
+          'DocumentRoot (it is incorrectly set to '.$documentroot.').'."\n".
+	  'This conflicts with conf/loncapa_apache.conf.'."\n");
+  }
 }
 </perlscript>
 </file>