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

version 1.1, 2002/01/29 10:32:44 version 1.20, 2006/09/15 21:02:15
Line 1 Line 1
   <!DOCTYPE piml PUBLIC "-//TUX/DTD piml 1.0 Final//EN" 
    "http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- webserver.piml -->  <!-- webserver.piml -->
 <!-- Scott Harrison -->  
   
 <!-- $Id$ -->  <!-- $Id$ -->
   
Line 37  http://www.lon-capa.org/ Line 38  http://www.lon-capa.org/
   
 <piml>  <piml>
 <targetroot>/</targetroot>  <targetroot>/</targetroot>
   <specialnotices>
   <specialnotice>
   </specialnotice>
   </specialnotices>
 <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
 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);
 }  }
 else {  else {
  open OUT,"&gt;&gt;<TARGET />";    # Append loncapa_apache.conf inclusion to httpd.conf if not present.
  print OUT 'Include srm.conf'."\n";    $flag=0;
  print OUT 'Include access.conf'."\n";    open(IN,'&lt;<TARGET />');
  close OUT;    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;
     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!^\s*DocumentRoot\s+(.*)$!) {
         $documentroot = $1;
         if ($documentroot !~ m!home/httpd/html!) {
           $documentroot_flag = 1;
         }
       }
     }
     close(IN);
     if ($scriptalias_flag==1) {
       print('**** ERROR **** /etc/httpd/conf/httpd.conf has an overlapping definition of '.
             'ScriptAlias (it is incorrectly set to '.$scriptalias.').'."\n".
             'This conflicts with loncapa_apache.conf.'."\n");
     }
     if ($documentroot_flag==1) {
       print('**** ERROR **** /etc/httpd/conf/httpd.conf has an overlapping definition of '.
             'DocumentRoot (it is incorrectly set to '.$documentroot.').'."\n".
             'This conflicts with loncapa_apache.conf.'."\n");
     }
 }  }
 </perlscript>  </perlscript>
 </file>  </file>
 <file>  
 <target dist='default'>/etc/httpd/conf/access.conf</target>  
 <note>This may or may not exist on a system depending on the version of  
 Apache</note>  
 <status>unverified</status>  
 <dependencies dist='default'>  
 /etc/httpd/conf/access.conf  
 </dependencies>  
 <perlscript mode='fg'>  
 open OUT,"&gt;&gt;<TARGET />";  
 print OUT 'Include loncapa.conf'."\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>  
 <status>unverified</status>  
 <dependencies dist='default'>  
 /etc/httpd/conf/srm.conf  
 </dependencies>  
 <perlscript mode='fg'>  
 open OUT,"&gt;&gt;<TARGET />";  
 print OUT 'Include loncapa.conf'."\n";  
 close OUT;  
 </perlscript>  
 </file>  
 </files>  </files>
 </piml>  </piml>

Removed from v.1.1  
changed lines
  Added in v.1.20


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