Diff for /doc/loncapafiles/webserver.piml between versions 1.18 and 1.19

version 1.18, 2005/10/10 02:30:46 version 1.19, 2006/01/23 19:36:03
Line 49  http://www.lon-capa.org/ Line 49  http://www.lon-capa.org/
 <dependencies dist='default'>  <dependencies dist='default'>
 /etc/httpd/conf/httpd.conf  /etc/httpd/conf/httpd.conf
 </dependencies>  </dependencies>
 <perlscript mode='fg'>  <perlscript mode='fg' dist="default">
 # Generated from doc/loncapafiles/webserver.piml  # Generated from doc/loncapafiles/webserver.piml
 unless (-e "<TARGET />") {  unless (-e "<TARGET />") {
   print '**** ERROR! /etc/httpd/conf/httpd.conf should exist! Are you missing the Apache '.    print '**** ERROR! /etc/httpd/conf/httpd.conf should exist! Are you missing the Apache '.
Line 125  else { Line 125  else {
   }    }
 }  }
 </perlscript>  </perlscript>
   <perlscript mode='fg' dist="suse9.2 suse9.3 sles9">
   </perlscript>
 <target dist='suse9.2 suse9.3 sles9'>/etc/httpd/httpd.conf</target>  <target dist='suse9.2 suse9.3 sles9'>/etc/httpd/httpd.conf</target>
 <note>This is for Apache 1.X for SuSE distributions</note>  <note>This is for Apache 1.X for SuSE distributions</note>
 <dependencies dist='suse9.2 suse9.3 sles9'>  <dependencies dist='suse9.2 suse9.3 sles9'>
Line 179  else { Line 181  else {
   $documentroot_flag=0;    $documentroot_flag=0;
   my $scriptalias;    my $scriptalias;
   my $documentroot;    my $documentroot;
     my $virtualhost = 0;
   open(IN,'&lt;<TARGET />');    open(IN,'&lt;<TARGET />');
   while (&lt;IN&gt;) {     while (&lt;IN&gt;) {
     if (m!^\s*ScriptAlias\s+/cgi-bin/\s+(.*)$!) {      if (m!^\s*ScriptAlias\s+/cgi-bin/\s+(.*)$!) {
       $scriptalias = $1;        $scriptalias = $1;
       if ($scriptalias !~ m!home/httpd/cgi-bin!) {        if ($scriptalias !~ m!home/httpd/cgi-bin!) {
  $scriptalias_flag = 1;   $scriptalias_flag = 1;
       }        }
     }      }
       if (m!^&lt;VirtualHost[^&gt;]*&gt;\s*$!) {
           $virtualhost = 1;
       }
       if (m!^&lt;/VirtualHost&gt;\s*$!) {
           $virtualhost = 0;
       }  
     if (m!^\s*DocumentRoot\s+(.*)$!) {      if (m!^\s*DocumentRoot\s+(.*)$!) {
       $documentroot = $1;        $documentroot = $1;
       if ($documentroot !~ m!home/httpd/html!) {        if ($documentroot !~ m!home/httpd/html!) {
  $documentroot_flag = 1;          if (!$virtualhost) {
       $documentroot_flag = 1;
           }
       }        }
     }      }
   }    }

Removed from v.1.18  
changed lines
  Added in v.1.19


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>