[BACK]Return to webserver.piml CVS log [TXT] [DIR] Up to [LON-CAPA] / doc / loncapafiles

Diff for /doc/loncapafiles/webserver.piml between versions 1.11 and 1.20

version 1.11, 2002/05/16 01:22:38 version 1.20, 2006/09/15 21:02:15
Line 1 Line 1
 <!DOCTYPE piml PUBLIC "-//TUX/DTD piml 1.0 Final//EN"   <!DOCTYPE piml PUBLIC "-//TUX/DTD piml 1.0 Final//EN" 
  "http://lpml.sourceforge.net/DTD/piml.dtd">   "http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- webserver.piml -->  <!-- webserver.piml -->
 <!-- Scott Harrison -->  
   
 <!-- $Id$ -->  <!-- $Id$ -->
   
Line 46  http://www.lon-capa.org/ Line 45  http://www.lon-capa.org/
 <files>  <files>
 <file>  <file>
 <target dist='default'>/etc/httpd/conf/httpd.conf</target>  <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'>/etc/apache2/default-server.conf</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 SuSE 10.1 and SLES 10 distribtions</note>
 <dependencies dist='default'>  <dependencies dist='default'>
 /etc/httpd/conf/httpd.conf  /etc/httpd/conf/httpd.conf
 </dependencies>  </dependencies>
 <perlscript mode='fg'>  <dependencies dist='suse9.2 suse9.3 sles9'>
   /etc/httpd/httpd.conf
   </dependencies>
   <dependencies dist='sles10'>
   /etc/apache2/default-server.conf
   </dependencies>
   <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! httpd.conf should exist! Are you missing the Apache '.    print '**** ERROR! <TARGET /> should exist! Are you missing the Apache '.
     'software package';      'software package?';
   exit(1);    exit(1);
 }  }
 else {  else {
   $flag=0;    # Append loncapa_apache.conf inclusion to httpd.conf if not present.
   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;  
   $flag=0;    $flag=0;
   open(IN,'&lt;<TARGET />');    open(IN,'&lt;<TARGET />');
   while (&lt;IN&gt;) {     while (&lt;IN&gt;) { 
Line 90  else { Line 79  else {
     print(OUT 'Include conf/loncapa_apache.conf'."\n");      print(OUT 'Include conf/loncapa_apache.conf'."\n");
     close(OUT);      close(OUT);
   }    }
     # Remove loncapa.conf inclusion from httpd.conf if present.
   $flag=0;    $flag=0;
   open(IN,'&lt;<TARGET />');    open(IN,'&lt;<TARGET />');
   while (&lt;IN&gt;) {    while (&lt;IN&gt;) {
Line 109  else { Line 99  else {
     print(OUT $in."\n");      print(OUT $in."\n");
     close(OUT);      close(OUT);
   }    }
 }  
 </perlscript>  # Checking for overlapping ScriptAlias and DocumentRoot definitions.
 </file>    $scriptalias_flag=0;
 <file>    $documentroot_flag=0;
 <target dist='default'>/etc/httpd/conf/access.conf</target>    my $scriptalias;
 <note>This may or may not exist on a system depending on the version of    my $documentroot;
 Apache</note>  
 <dependencies dist='default'>  
 /etc/httpd/conf/access.conf  
 </dependencies>  
 <perlscript mode='fg'>  
 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>  
 <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  
 </dependencies>  
 <perlscript mode='fg'>  
 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 />');    open(IN,'&lt;<TARGET />');
   while (&lt;IN&gt;) {    while (&lt;IN&gt;) {
     if (/^\s*Include\s+conf\/loncapa.conf/) {      if (m!^\s*ScriptAlias\s+/cgi-bin/\s+(.*)$!) {
       $flag=1;        $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);    close(IN);
   $in='';    if ($scriptalias_flag==1) {
   if ($flag==1) {      print('**** ERROR **** /etc/httpd/conf/httpd.conf has an overlapping definition of '.
     open(IN,'&lt;<TARGET />');            'ScriptAlias (it is incorrectly set to '.$scriptalias.').'."\n".
     while(&lt;IN&gt;) {            'This conflicts with loncapa_apache.conf.'."\n");
       $in.=$_ unless /^\s*Include\s+conf\/loncapa.conf/;    }
     }    if ($documentroot_flag==1) {
     close(IN);      print('**** ERROR **** /etc/httpd/conf/httpd.conf has an overlapping definition of '.
     open(OUT,'&gt;<TARGET />');            'DocumentRoot (it is incorrectly set to '.$documentroot.').'."\n".
     print(OUT $in."\n");            'This conflicts with loncapa_apache.conf.'."\n");
     close(OUT);  
   }    }
 }  }
 </perlscript>  </perlscript>
Removed from v.1.11  
changed lines
  Added in v.1.20

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