Diff for /doc/loncapafiles/webserver.piml between versions 1.2 and 1.15

version 1.2, 2002/02/02 12:57:10 version 1.15, 2004/02/10 20:54:14
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 36  http://www.lon-capa.org/ Line 37  http://www.lon-capa.org/
 <!-- defined. -->  <!-- defined. -->
   
 <piml>  <piml>
 <targetroot>/abc/</targetroot>  <targetroot>/</targetroot>
 <specialnotices>  <specialnotices>
 <specialnotice>  <specialnotice>
 </specialnotice>  </specialnotice>
Line 49  http://www.lon-capa.org/ Line 50  http://www.lon-capa.org/
 /etc/httpd/conf/httpd.conf  /etc/httpd/conf/httpd.conf
 </dependencies>  </dependencies>
 <perlscript mode='fg'>  <perlscript mode='fg'>
   # 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! httpd.conf 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);
     }
 }  }
 </perlscript>  </perlscript>
 </file>  </file>
 <file>  <file>
 <target dist='default'>/etc/httpd/conf/access.conf</target>  <target dist='default'>/etc/httpd/conf/httpd.conf</target>
 <note>This may or may not exist on a system depending on the version of  <note>This is always expected for any version of Apache</note>
 Apache</note>  
 <dependencies dist='default'>  <dependencies dist='default'>
 /etc/httpd/conf/access.conf  /etc/httpd/conf/httpd.conf
 </dependencies>  </dependencies>
 <perlscript mode='fg'>  <perlscript mode='fg'>
   # Generated from doc/loncapafiles/webserver.piml
   # Trying to check for overlapping DocumentRoot or ScriptAlias definitions.
 unless (-e "<TARGET />") {  unless (-e "<TARGET />") {
  print &lt;&lt;;    print '**** ERROR **** httpd.conf should exist! Are you missing the Apache '.
 WARNING! access.conf is not currently present on your system.      'software package?';
 This is either due to     exit(1);
 * you are missing the Apache software package,  
 * you have a newer version of Apache that does not  
   ordinarily install an access.conf  
 * configuration files are installed in a directory location  
   different than for <TARGET />  
 For backwards compatibility,  
 <TARGET /> is being generated.  
 END  
 }  }
 open OUT,"&gt;&gt;<TARGET />";  else {
 print OUT 'Include loncapa.conf'."\n";    # Append loncapa_apache.conf inclusion to httpd.conf if not present.
 close OUT;    $scriptalias_flag=0;
 </perlscript>    $documentroot_flag=0;
 </file>    my $scriptalias;
 <file>    my $documentroot;
 <target dist='default'>/etc/httpd/conf/srm.conf</target>    open(IN,'&lt;<TARGET />');
 <note>This may or may not exist on a system depending on the version of    while (&lt;IN&gt;) { 
 Apache</note>      if (m!^\s*ScriptAlias\s+/cgi-bin/\s+(.*)$!) {
 <dependencies dist='default'>        $scriptalias = $1;
 /etc/httpd/conf/srm.conf        if ($scriptalias !~ m!home/httpd/cgi-bin!) {
 </dependencies>   $scriptalias_flag = 1;
 <perlscript mode='fg'>        }
 unless (-e "<TARGET />") {      }
  print &lt;&lt;;      if (m!^\s*DocumentRoot\s+(.*)$!) {
 WARNING! srm.conf is not currently present on your system.        $documentroot = $1;
 This is either due to         if ($documentroot !~ m!home/httpd/html!) {
 * you are missing the Apache software package,   $documentroot_flag = 1;
 * you have a newer version of Apache that does not        }
   ordinarily install an srm.conf      }
 * configuration files are installed in a directory location    }
   different than for <TARGET />    close(IN);
 For backwards compatibility,    if ($scriptalias_flag==1) {
 <TARGET /> is being generated.      print('**** ERROR **** httpd.conf has an overlapping definition of '.
 END            'ScriptAlias (it is incorrectly set to '.$scriptalias.').'."\n".
     'This conflicts with loncapa_apache.conf.'."\n");
     }
     if ($documentroot_flag==1) {
       print('**** ERROR **** httpd.conf has an overlapping definition of '.
             'DocumentRoot (it is incorrectly set to '.$documentroot.').'."\n".
     'This conflicts with loncapa_apache.conf.'."\n");
     }
 }  }
 open OUT,"&gt;&gt;<TARGET />";  
 print OUT 'Include loncapa.conf'."\n";  
 close OUT;  
 </perlscript>  </perlscript>
 </file>  </file>
 </files>  </files>

Removed from v.1.2  
changed lines
  Added in v.1.15


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