Diff for /doc/loncapafiles/webserver.piml between versions 1.9 and 1.35

version 1.9, 2002/05/12 19:02:18 version 1.35, 2012/10/05 15:36:22
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 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2'>/etc/apache2/default-server.conf</target>
   <target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/etc/apache2/sites-available/loncapa</target>
   <note>This is for Apache 1.X for Red Hat 4ES, Fedora 2, 3 and 4, SusSE 9.2 and 9.3, and SLES 9 distributions. This is for Apache 2.X for Fedora 5, Red Hat 5, CentOS 5, Scientific Linux 5, SuSE 10.1, SLES 10, Debian 5, Ubuntu LTS 8 and later 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 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>
   /etc/apache2/sites-available/loncapa
   </dependencies>
   <dependencies dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2'>
   /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 {
     # 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;) { if (/^\s*Include\s+conf\/srm.conf/) { $flag=1; } }  
   close IN;  
   unless ($flag==1) {  
  open OUT,"&gt;&gt;<TARGET />";  
  print OUT 'Include conf/srm.conf'."\n";  
  close OUT;  
   }  
   $flag=0;  
   open IN, "&lt;<TARGET />";  
   while (&lt;IN&gt;) { if (/^\s*Include\s+conf\/access.conf/) { $flag=1; } }  
   close IN;  
   unless ($flag==1) {  
  open OUT,"&gt;&gt;<TARGET />";  
  print OUT 'Include conf/access.conf'."\n";  
  close OUT;  
   }  
   my $eflag=0;  
   $flag=0;  
   open IN, "&lt;<TARGET />";  
   while (&lt;IN&gt;) {     while (&lt;IN&gt;) { 
     if (/^\s*Include\s+conf\/loncapa_apache.conf/) {      if (/^\s*Include\s+conf\/loncapa_apache.conf/) {
       $flag=1;         $flag=1; 
     }      }
   }    }
   close IN;    close(IN);
   unless ($flag==1) {    unless ($flag==1) {
  open OUT,"&gt;&gt;<TARGET />";      open(OUT,'&gt;&gt;<TARGET />');
  print OUT 'Include conf/loncapa_apache.conf'."\n";      print(OUT 'Include conf/loncapa_apache.conf'."\n");
  close OUT;      close(OUT);
   }    }
     # Remove loncapa.conf inclusion from httpd.conf if present.
   $flag=0;    $flag=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+conf\/loncapa.conf/) {
       $flag=1;         $flag=1;
     }      }
   }    }
   close IN;    close(IN);
   unless ($flag==1) {    $in='';
  open OUT,"&gt;&gt;<TARGET />";    if ($flag==1) {
  print OUT 'Include conf/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);
     }
   
   # 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);
 </perlscript>    if ($scriptalias_flag==1) {
 </file>        my $conffile = '/etc/httpd/conf/httpd.conf';
 <file>        if ('<DIST />' eq 'suse9.2' || '<DIST />' eq 'suse9.3
 <target dist='default'>/etc/httpd/conf/access.conf</target>            || '<DIST />' eq 'sles9') {
 <note>This may or may not exist on a system depending on the version of            $conffile =  '/etc/httpd/httpd.conf';
 Apache</note>        } elsif ('<DIST />' =~ /^(suse|sles)/) {
 <dependencies dist='default'>            $conffile = '/etc/apache2/default-server.conf';
 /etc/httpd/conf/access.conf        } elsif ('<DIST />' =~ /^(debian|ubuntu)/) {
 </dependencies>            $conffile = '/etc/apache2/sites-available/loncapa';
 <perlscript mode='fg'>        }
 unless (-e "<TARGET />") {        print('**** ERROR **** '.$conffile.' has an overlapping definition of '.
  print &lt;&lt;END;              'ScriptAlias (it is incorrectly set to '.$scriptalias.').'."\n".
 WARNING! access.conf is not currently present on your system.              'This conflicts with loncapa_apache.conf.'."\n");
 This is either due to     }
 * you are missing the Apache software package,    if ($documentroot_flag==1) {
 * you have a newer version of Apache that does not        print('**** ERROR **** '.$conffile.' has an overlapping definition of '.
   ordinarily install an access.conf              'DocumentRoot (it is incorrectly set to '.$documentroot.').'."\n".
 * configuration files are installed in a directory location              'This conflicts with loncapa_apache.conf.'."\n");
   different than for <TARGET />    }
 For backwards compatibility,  
 <TARGET /> is being generated.  # Checking for rewrites of http:// to https://
 END      my $rewrite_dir = '/etc/httpd/conf/rewrites';
 }      my $curr_rewrite = '/etc/httpd/conf/loncapa_rewrite.conf';
 my $flag=0;      if ('<DIST />' eq 'suse9.2' || '<DIST />' eq 'suse9.3'
 open IN, "&lt;<TARGET />";          || '<DIST />' eq 'sles9') {
 while (&lt;IN&gt;) { if (/^\s*Include\s+conf\/loncapa_apache.conf/)          $rewrite_dir = '/etc/httpd/rewrites/';
  { $flag=1; } }          $curr_rewrite = '/etc/httpd/loncapa_rewrite.conf';
 close IN;      } elsif ('<DIST />' =~ /^(suse|sles|debian|ubuntu)/) {
 unless ($flag==1) {          $rewrite_dir = '/etc/apache2/rewrites';
 open OUT,"&gt;&gt;<TARGET />";          $curr_rewrite = '/etc/apache2/loncapa_rewrite.conf';
 print OUT 'Include conf/loncapa_apache.conf'."\n";      }
 close OUT;      my $rewrite_off = $rewrite_dir.'/loncapa_rewrite_off.conf';
 $flag=0;      my $rewrite_on = $rewrite_dir.'/loncapa_rewrite_on.conf';
 open IN, "&lt;<TARGET />";      if (!-e $curr_rewrite) { 
 while (&lt;IN&gt;) { if (/^\s*Include\s+conf\/loncapa.conf/) { $flag=1; } }          system("cp $rewrite_off $curr_rewrite");
 close IN;          chmod(0644, $curr_rewrite);
 unless ($flag==1) {      } else {
 open OUT,"&gt;&gt;<TARGET />";          my ($not_rewrite_on,$not_rewrite_off);
 print OUT 'Include conf/loncapa.conf'."\n";          if (open(PIPE, "diff --brief $rewrite_off $curr_rewrite |")) {
 close OUT;              my $diffres = &lt;PIPE&gt; ;
 }              close(PIPE);
 </perlscript>              chomp($diffres);
 </file>              if ($diffres) {
 <file>                  $not_rewrite_off = 1;
 <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>          if (open(PIPE, "diff --brief $rewrite_on $curr_rewrite |")) {
 <dependencies dist='default'>              my $diffres = &lt;PIPE&gt; ;
 /etc/httpd/conf/srm.conf              close(PIPE);
 </dependencies>              chomp($diffres);
 <perlscript mode='fg'>              if ($diffres) {
 unless (-e "<TARGET />") {                  $not_rewrite_on = 1;
  print &lt;&lt;END;              }
 WARNING! srm.conf is not currently present on your system.          }
 This is either due to           unless ($not_rewrite_off || $not_rewrite_on) {
 * you are missing the Apache software package,              print('**** WARNING **** '.$curr_rewrite.' does not match '.
 * you have a newer version of Apache that does not              'either: '.$rewrite_on.' - the file used to enable rewriting '.
   ordinarily install an srm.conf              'of requests for http:// to https:// or: '.$rewrite_off.
 * configuration files are installed in a directory location              ' - the file used to disable such rewriting'."\n\n".
   different than for <TARGET />              'This may be because '. $curr_rewrite.' has been '. 
 For backwards compatibility,              'previously customized, or it may be because of a change '.  
 <TARGET /> is being generated.              'to the files in '.$rewrite_dir."\n");
 END          }
 }      }
 my $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;  
 $flag=0;  
 open IN, "&lt;<TARGET />";  
 while (&lt;IN&gt;) { if (/^\s*Include\s+conf\/loncapa.conf/) { $flag=1; } }  
 close IN;  
 unless ($flag==1) {  
 open OUT,"&gt;&gt;<TARGET />";  
 print OUT 'Include conf/loncapa.conf'."\n";  
 close OUT;  
 }  }
 </perlscript>  </perlscript>
 </file>  </file>

Removed from v.1.9  
changed lines
  Added in v.1.35


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