--- doc/loncapafiles/webserver.piml	2002/04/14 20:34:32	1.8
+++ doc/loncapafiles/webserver.piml	2002/05/16 01:22:38	1.11
@@ -3,7 +3,7 @@
 <!-- webserver.piml -->
 <!-- Scott Harrison -->
 
-<!-- $Id: webserver.piml,v 1.8 2002/04/14 20:34:32 harris41 Exp $ -->
+<!-- $Id: webserver.piml,v 1.11 2002/05/16 01:22:38 harris41 Exp $ -->
 
 <!--
 
@@ -51,42 +51,63 @@ 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 {
   $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 conf/srm.conf'."\n";
-	close OUT;
+  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;
-  unless ($flag==1) {
-	open OUT,"&gt;&gt;<TARGET />";
-	print OUT 'Include conf/access.conf'."\n";
-	close OUT;
+  if ($flag!=1 and -e '/etc/httpd/conf/access.conf') {
+    open(OUT,'&gt;&gt;<TARGET />');
+    print(OUT 'Include conf/access.conf'."\n");
+    close(OUT);
   }
-  $flag=0;
   my $eflag=0;
-  open IN, "&lt;<TARGET />";
+  $flag=0;
+  open(IN,'&lt;<TARGET />');
   while (&lt;IN&gt;) { 
-    if (/^\s*Include\s+conf\/loncapa.conf/) {
+    if (/^\s*Include\s+conf\/loncapa_apache.conf/) {
       $flag=1; 
     }
   }
-  close IN;
+  close(IN);
   unless ($flag==1) {
-	open OUT,"&gt;&gt;<TARGET />";
-	print OUT 'Include conf/loncapa.conf'."\n";
-	close OUT;
+    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);
   }
 }
 </perlscript>
@@ -99,27 +120,35 @@ Apache</note>
 /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 conf/loncapa.conf'."\n";
-close OUT;
+if (-e '<TARGET />') {
+  my $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);
+  }
+  $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>
@@ -131,27 +160,39 @@ Apache</note>
 /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 conf/loncapa.conf'."\n";
-close OUT;
+if (-e '<TARGET />') {
+  my $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);
+  }
+  $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>