Diff for /doc/loncapafiles/webserver.piml between versions 1.13 and 1.27

version 1.13, 2003/01/13 22:01:32 version 1.27, 2009/07/17 15:40:49
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 suse10.1 suse10.2 suse10.3 suse11.1'>/etc/apache2/default-server.conf</target>
   <target dist='debian5 ubuntu6 ubuntu8'>/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'>  <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='debian5 ubuntu6 ubuntu8'>
   /etc/apache2/sites-available/loncapa
   </dependencies>
   <dependencies dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1'>
   /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 {
   # 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;    $flag=0;
   open(IN,'&lt;<TARGET />');    open(IN,'&lt;<TARGET />');
   while (&lt;IN&gt;) {     while (&lt;IN&gt;) { 
Line 92  else { Line 103  else {
     print(OUT $in."\n");      print(OUT $in."\n");
     close(OUT);      close(OUT);
   }    }
 }  
 </perlscript>  # Checking for overlapping ScriptAlias and DocumentRoot definitions.
 </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.  
   $scriptalias_flag=0;    $scriptalias_flag=0;
   $documentroot_flag=0;    $documentroot_flag=0;
   my $scriptalias;    my $scriptalias;
   my $documentroot;    my $documentroot;
   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!^\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;          $documentroot_flag = 1;
       }        }
     }      }
   }    }
   close(IN);    close(IN);
   if ($scriptalias_flag==1) {    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".            '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) {    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".            'DocumentRoot (it is incorrectly set to '.$documentroot.').'."\n".
   'This conflicts with loncapa_apache.conf.'."\n");            'This conflicts with loncapa_apache.conf.'."\n");
   }  
   if ($documentroot_flag==1 or $scriptalias_flag==1) {  
     exit(1);  
   }    }
 }  }
 </perlscript>  </perlscript>

Removed from v.1.13  
changed lines
  Added in v.1.27


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