Diff for /doc/loncapafiles/webserver.piml between versions 1.3 and 1.16

version 1.3, 2002/02/02 13:08:42 version 1.16, 2004/08/23 19:07:26
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 {
     # Append loncapa_apache.conf inclusion to httpd.conf if not present.
   $flag=0;    $flag=0;
   open IN, "&lt;<TARGET />";    open(IN,'&lt;<TARGET />');
   while (&lt;IN&gt;) { if (/^\s*Include\s+srm.conf/) { $flag=1; } }    while (&lt;IN&gt;) { 
   close IN;      if (/^\s*Include\s+conf\/loncapa_apache.conf/) {
   unless ($flag==0) {        $flag=1; 
  open OUT,"&gt;&gt;<TARGET />";      }
  print OUT 'Include srm.conf'."\n";  
  close OUT;  
   }    }
   $flag=0;    close(IN);
   open IN, "&lt;<TARGET />";    unless ($flag==1) {
   while (&lt;IN&gt;) { if (/^\s*Include\s+access.conf/) { $flag=1; } }      open(OUT,'&gt;&gt;<TARGET />');
   close IN;      print(OUT 'Include conf/loncapa_apache.conf'."\n");
   unless ($flag==0) {      close(OUT);
  open OUT,"&gt;&gt;<TARGET />";  
  print OUT 'Include access.conf'."\n";  
  close OUT;  
   }    }
     # Remove loncapa.conf inclusion from httpd.conf if present.
   $flag=0;    $flag=0;
   my $eflag=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 (/^\s*Include\s+loncapa.conf/) {        $flag=1;
       $flag=1;   
     }      }
   }    }
   close IN;    close(IN);
   unless ($flag==0) {    $in='';
  open OUT,"&gt;&gt;<TARGET />";    if ($flag==1) {
  print OUT 'Include loncapa.conf'."\n";      open(IN,'&lt;<TARGET />');
  close OUT;      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'>  
 /etc/httpd/conf/access.conf  
 </dependencies>  
 <perlscript mode='fg'>  
 unless (-e "<TARGET />") {  
  print &lt;&lt;;  
 WARNING! access.conf is not currently present on your system.  
 This is either due to   
 * 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  
 }  
 my $flag=0;  
 open IN, "&lt;<TARGET />";  
 while (&lt;IN&gt;) { if (/^\s*Include\s+loncapa.conf/) { $flag=1; } }  
 close IN;  
 unless ($flag==0) {  
 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>  
 <dependencies dist='default'>  <dependencies dist='default'>
 /etc/httpd/conf/srm.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! srm.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 srm.conf  
 * configuration files are installed in a directory location  
   different than for <TARGET />  
 For backwards compatibility,  
 <TARGET /> is being generated.  
 END  
 }  }
 my $flag=0;  else {
 open IN, "&lt;<TARGET />";    # Append loncapa_apache.conf inclusion to httpd.conf if not present.
 while (&lt;IN&gt;) { if (/^\s*Include\s+loncapa.conf/) { $flag=1; } }    $scriptalias_flag=0;
 close IN;    $documentroot_flag=0;
 unless ($flag==0) {    my $scriptalias;
 open OUT,"&gt;&gt;<TARGET />";    my $documentroot;
 print OUT 'Include loncapa.conf'."\n";    open(IN,'&lt;<TARGET />');
 close OUT;    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 **** 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 **** 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>

Removed from v.1.3  
changed lines
  Added in v.1.16


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