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

Diff for /doc/loncapafiles/webserver.piml between versions 1.17 and 1.18

version 1.17, 2004/12/21 18:37:22 version 1.18, 2005/10/10 02:30:46
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 always expected for any version of Apache</note>  <note>This is for Apache 1.X for Red Hat and Fedora distributions</note>
 <dependencies dist='default'>  <dependencies dist='default'>
 /etc/httpd/conf/httpd.conf  /etc/httpd/conf/httpd.conf
 </dependencies>  </dependencies>
Line 91  else { Line 91  else {
     print(OUT $in."\n");      print(OUT $in."\n");
     close(OUT);      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>  <target dist='suse9.2 suse9.3 sles9'>/etc/httpd/httpd.conf</target>
 <file>  <note>This is for Apache 1.X for SuSE distributions</note>
 <target dist='default'>/etc/httpd/conf/httpd.conf</target>  <dependencies dist='suse9.2 suse9.3 sles9'>
 <note>This is always expected for any version of Apache</note>  /etc/httpd/httpd.conf
 <dependencies dist='default'>  
 /etc/httpd/conf/httpd.conf  
 </dependencies>  </dependencies>
 <perlscript mode='fg'>  <perlscript mode='fg' dist='suse9.2 suse9.3 sles9'>
 # Generated from doc/loncapafiles/webserver.piml  # Generated from doc/loncapafiles/webserver.piml
 # Trying to check for overlapping DocumentRoot or ScriptAlias definitions.  # Trying to check for overlapping DocumentRoot or ScriptAlias definitions.
 unless (-e "<TARGET />") {  unless (-e "<TARGET />") {
   print '**** ERROR **** /etc/httpd/conf/httpd.conf should exist! Are you missing the Apache '.    print '**** ERROR **** /etc/httpd/httpd.conf should exist! Are you missing the Apache '.
     'software package?';      'software package?';
   exit(1);    exit(1);
 }  }
 else {  else {
   # Append loncapa_apache.conf inclusion to httpd.conf if not present.    # 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;    $scriptalias_flag=0;
   $documentroot_flag=0;    $documentroot_flag=0;
   my $scriptalias;    my $scriptalias;
Line 131  else { Line 196  else {
   }    }
   close(IN);    close(IN);
   if ($scriptalias_flag==1) {    if ($scriptalias_flag==1) {
     print('**** ERROR **** /etc/httpd/conf/httpd.conf has an overlapping definition of '.      print('**** ERROR **** /etc/httpd/httpd.conf has an overlapping definition of '.
           'ScriptAlias (it is incorrectly set to '.$scriptalias.').'."\n".            'ScriptAlias (it is incorrectly set to '.$scriptalias.').'."\n".
   'This conflicts with loncapa_apache.conf.'."\n");    'This conflicts with conf/loncapa_apache.conf.'."\n");
   }    }
   if ($documentroot_flag==1) {    if ($documentroot_flag==1) {
     print('**** ERROR **** /etc/httpd/conf/httpd.conf has an overlapping definition of '.      print('**** ERROR **** /etc/httpd/httpd.conf has an overlapping definition of '.
           'DocumentRoot (it is incorrectly set to '.$documentroot.').'."\n".            'DocumentRoot (it is incorrectly set to '.$documentroot.').'."\n".
   'This conflicts with loncapa_apache.conf.'."\n");    'This conflicts with conf/loncapa_apache.conf.'."\n");
   }    }
 }  }
 </perlscript>  </perlscript>
Removed from v.1.17  
changed lines
  Added in v.1.18

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