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

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

version 1.19, 2006/01/23 19:36:03 version 1.23, 2007/12/07 06:01:06
Line 45  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 for Apache 1.X for Red Hat and Fedora distributions</note>  <target dist='suse9.2 suse9.3 sles9'>/etc/httpd/httpd.conf</target>
   <target dist='sles10 suse10.1 suse10.2 suse10.3'>/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 later, and SuSE 10.X and SLES 10 distribtions</note>
 <dependencies dist='default'>  <dependencies dist='default'>
 /etc/httpd/conf/httpd.conf  /etc/httpd/conf/httpd.conf
 </dependencies>  </dependencies>
   <dependencies dist='suse9.2 suse9.3 sles9'>
   /etc/httpd/httpd.conf
   </dependencies>
   <dependencies dist='sles10 suse10.1 suse10.2 suse10.3'>
   /etc/apache2/default-server.conf
   </dependencies>
 <perlscript mode='fg' dist="default">  <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! <TARGET /> should exist! Are you missing the Apache '.
     'software package?';      'software package?';
   exit(1);    exit(1);
 }  }
Line 125  else { Line 133  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>  
 <note>This is for Apache 1.X for SuSE distributions</note>  
 <dependencies dist='suse9.2 suse9.3 sles9'>  
 /etc/httpd/httpd.conf  
 </dependencies>  
 <perlscript mode='fg' dist='suse9.2 suse9.3 sles9'>  
 # Generated from doc/loncapafiles/webserver.piml  
 # Trying to check for overlapping DocumentRoot or ScriptAlias definitions.  
 unless (-e "<TARGET />") {  
   print '**** ERROR **** /etc/httpd/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.  
   $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);  
   }  
   # Remove loncapa.conf inclusion from httpd.conf if present.  
   $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);  
   }  
   
   # Checking for overlapping ScriptAlias and DocumentRoot definitions.  
   $scriptalias_flag=0;  
   $documentroot_flag=0;  
   my $scriptalias;  
   my $documentroot;  
   my $virtualhost = 0;  
   open(IN,'&lt;<TARGET />');  
   while (&lt;IN&gt;) {  
     if (m!^\s*ScriptAlias\s+/cgi-bin/\s+(.*)$!) {  
       $scriptalias = $1;  
       if ($scriptalias !~ m!home/httpd/cgi-bin!) {  
  $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+(.*)$!) {  
       $documentroot = $1;  
       if ($documentroot !~ m!home/httpd/html!) {  
         if (!$virtualhost) {  
     $documentroot_flag = 1;  
         }  
       }  
     }  
   }  
   close(IN);  
   if ($scriptalias_flag==1) {  
     print('**** ERROR **** /etc/httpd/httpd.conf has an overlapping definition of '.  
           'ScriptAlias (it is incorrectly set to '.$scriptalias.').'."\n".  
   'This conflicts with conf/loncapa_apache.conf.'."\n");  
   }  
   if ($documentroot_flag==1) {  
     print('**** ERROR **** /etc/httpd/httpd.conf has an overlapping definition of '.  
           'DocumentRoot (it is incorrectly set to '.$documentroot.').'."\n".  
   'This conflicts with conf/loncapa_apache.conf.'."\n");  
   }  
 }  
 </perlscript>  
 </file>  </file>
 </files>  </files>
 </piml>  </piml>
Removed from v.1.19  
changed lines
  Added in v.1.23

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