--- doc/loncapafiles/webserver.piml	2003/02/03 18:03:51	1.14
+++ doc/loncapafiles/webserver.piml	2011/02/27 18:54:59	1.31
@@ -2,7 +2,7 @@
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- webserver.piml -->
 
-<!-- $Id: webserver.piml,v 1.14 2003/02/03 18:03:51 harris41 Exp $ -->
+<!-- $Id: webserver.piml,v 1.31 2011/02/27 18:54:59 raeburn Exp $ -->
 
 <!--
 
@@ -45,19 +45,31 @@ 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>
+<target dist='suse9.2 suse9.3 sles9'>/etc/httpd/httpd.conf</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4'>/etc/apache2/default-server.conf</target>
+<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>/etc/apache2/sites-available/loncapa</target>
+<note>This is for Apache 1.X for Red Hat, Fedora 2,3 and 4, and SusSE 9.2, 9.3 and SLES 9 distributions. This is for Apache 2.X for Fedora 5 and later, and SuSE 10.X, 11.X and SLES 10 distributions, and Debian 5, Ubuntu 6 and Ubuntu 8 LTS distributions</note>
 <dependencies dist='default'>
 /etc/httpd/conf/httpd.conf
 </dependencies>
-<perlscript mode='fg'>
+<dependencies dist='suse9.2 suse9.3 sles9'>
+/etc/httpd/httpd.conf
+</dependencies>
+<dependencies dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>
+/etc/apache2/sites-available/loncapa
+</dependencies>
+<dependencies dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4'>
+/etc/apache2/default-server.conf
+</dependencies>
+<perlscript mode='fg' dist="default">
 # Generated from doc/loncapafiles/webserver.piml
 unless (-e "<TARGET />") {
-  print 'ERROR! httpd.conf should exist! Are you missing the Apache '.
+  print '**** ERROR! <TARGET /> should exist! Are you missing the Apache '.
     'software package?';
   exit(1);
 }
 else {
-  # Append loncapa_apache.conf inclusion to httpd.conf if not present.
+  # Append loncapa_apache.conf inclusion to httpd.conf (or sites/available/loncapa) if not present.
   $flag=0;
   open(IN,'&lt;<TARGET />');
   while (&lt;IN&gt;) { 
@@ -91,57 +103,37 @@ else {
     print(OUT $in."\n");
     close(OUT);
   }
-}
-</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.
+
+# 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;) { 
+  while (&lt;IN&gt;) {
     if (m!^\s*ScriptAlias\s+/cgi-bin/\s+(.*)$!) {
       $scriptalias = $1;
       if ($scriptalias !~ m!home/httpd/cgi-bin!) {
-	$scriptalias_flag = 1;
+        $scriptalias_flag = 1;
       }
     }
     if (m!^\s*DocumentRoot\s+(.*)$!) {
       $documentroot = $1;
       if ($documentroot !~ m!home/httpd/html!) {
-	$documentroot_flag = 1;
+        $documentroot_flag = 1;
       }
     }
   }
   close(IN);
   if ($scriptalias_flag==1) {
-    print('**** ERROR **** httpd.conf has an overlapping definition of '.
+    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");
+          'This conflicts with loncapa_apache.conf.'."\n");
   }
   if ($documentroot_flag==1) {
-    print('**** ERROR **** httpd.conf has an overlapping definition of '.
+    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");
-  }
-  if ($documentroot_flag==1 or $scriptalias_flag==1) {
-    exit(1);
+          'This conflicts with loncapa_apache.conf.'."\n");
   }
 }
 </perlscript>