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

Diff for /doc/loncapafiles/webserver.piml between versions 1.27 and 1.39

version 1.27, 2009/07/17 15:40:49 version 1.39, 2014/06/03 20:35:04
Line 46  http://www.lon-capa.org/ Line 46  http://www.lon-capa.org/
 <file>  <file>
 <target dist='default'>/etc/httpd/conf/httpd.conf</target>  <target dist='default'>/etc/httpd/conf/httpd.conf</target>
 <target dist='suse9.2 suse9.3 sles9'>/etc/httpd/httpd.conf</target>  <target dist='suse9.2 suse9.3 sles9'>/etc/httpd/httpd.conf</target>
 <target dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1'>/etc/apache2/default-server.conf</target>  <target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1'>/etc/apache2/default-server.conf</target>
 <target dist='debian5 ubuntu6 ubuntu8'>/etc/apache2/sites-available/loncapa</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, 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 later, and SuSE 10.X, 11.X and SLES 10 distributions, and Debian 5, Ubuntu 6 and Ubuntu 8 LTS distributions</note>  <target dist='ubuntu14'>/etc/apache2/conf-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>
 <dependencies dist='suse9.2 suse9.3 sles9'>  <dependencies dist='suse9.2 suse9.3 sles9'>
 /etc/httpd/httpd.conf  /etc/httpd/httpd.conf
 </dependencies>  </dependencies>
 <dependencies dist='debian5 ubuntu6 ubuntu8'>  <dependencies dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>
 /etc/apache2/sites-available/loncapa  /etc/apache2/sites-available/loncapa
 </dependencies>  </dependencies>
 <dependencies dist='sles10 suse10.1 suse10.2 suse10.3 suse11.1'>  <dependencies dist='ubuntu14'>
   /etc/apache2/conf-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 suse12.3 suse13.1'>
 /etc/apache2/default-server.conf  /etc/apache2/default-server.conf
 </dependencies>  </dependencies>
 <perlscript mode='fg' dist="default">  <perlscript mode='fg' dist="default">
Line 69  unless (-e "<TARGET />") { Line 73  unless (-e "<TARGET />") {
   exit(1);    exit(1);
 }  }
 else {  else {
   # Append loncapa_apache.conf inclusion to httpd.conf (or sites/available/loncapa) if not present.    # Append loncapa_apache.conf inclusion to httpd.conf 
     # (or sites-available/loncapa or conf-available/loncapa) if not present.
   $flag=0;    $flag=0;
   open(IN,'&lt;<TARGET />');    open(IN,'&lt;<TARGET />');
   while (&lt;IN&gt;) {     while (&lt;IN&gt;) { 
Line 83  else { Line 88  else {
     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.    # Remove loncapa.conf inclusion from httpd.conf 
     # (or sites-available/loncapa or conf-available/loncapa) if present.
   $flag=0;    $flag=0;
   open(IN,'&lt;<TARGET />');    open(IN,'&lt;<TARGET />');
   while (&lt;IN&gt;) {    while (&lt;IN&gt;) {
Line 126  else { Line 132  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 '.        my $conffile = '/etc/httpd/conf/httpd.conf';
           'ScriptAlias (it is incorrectly set to '.$scriptalias.').'."\n".        if ('<DIST />' eq 'suse9.2' || '<DIST />' eq 'suse9.3' 
           'This conflicts with loncapa_apache.conf.'."\n");            || '<DIST />' eq 'sles9') {
             $conffile =  '/etc/httpd/httpd.conf';
         } elsif ('<DIST />' =~ /^(suse|sles)/) {
             $conffile = '/etc/apache2/default-server.conf';
         } elsif ('<DIST />' =~ /^(debian|ubuntu)/) {
             $conffile = '/etc/apache2/sites-available/loncapa';
         }
         print('**** ERROR **** '.$conffile.' has an overlapping definition of '.
               'ScriptAlias (it is incorrectly set to '.$scriptalias.').'."\n".
               'This conflicts with 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 **** '.$conffile.' 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 loncapa_apache.conf.'."\n");
   }    }
   
   # Checking for rewrites of http:// to https://
       my $rewrite_dir = '/etc/httpd/conf/rewrites';
       my $curr_rewrite = '/etc/httpd/conf/loncapa_rewrite.conf';
       if ('<DIST />' eq 'suse9.2' || '<DIST />' eq 'suse9.3'
           || '<DIST />' eq 'sles9') {
           $rewrite_dir = '/etc/httpd/rewrites/';
           $curr_rewrite = '/etc/httpd/loncapa_rewrite.conf';
       } elsif ('<DIST />' =~ /^(suse|sles|debian|ubuntu)/) {
           $rewrite_dir = '/etc/apache2/rewrites';
           $curr_rewrite = '/etc/apache2/loncapa_rewrite.conf';
       }
       my $rewrite_off = $rewrite_dir.'/loncapa_rewrite_off.conf';
       my $rewrite_on = $rewrite_dir.'/loncapa_rewrite_on.conf';
       if (!-e $curr_rewrite) { 
           system("cp $rewrite_off $curr_rewrite");
           chmod(0644, $curr_rewrite);
       } else {
           my ($not_rewrite_on,$not_rewrite_off);
           if (open(PIPE, "diff --brief $rewrite_off $curr_rewrite |")) {
               my $diffres = &lt;PIPE&gt; ;
               close(PIPE);
               chomp($diffres);
               if ($diffres) {
                   $not_rewrite_off = 1;
               }
           }
           if (open(PIPE, "diff --brief $rewrite_on $curr_rewrite |")) {
               my $diffres = &lt;PIPE&gt; ;
               close(PIPE);
               chomp($diffres);
               if ($diffres) {
                   $not_rewrite_on = 1;
               }
           }
           unless ($not_rewrite_off || $not_rewrite_on) {
               print('**** WARNING **** '.$curr_rewrite.' does not match '.
               'either: '.$rewrite_on.' - the file used to enable rewriting '.
               'of requests for http:// to https:// or: '.$rewrite_off.
               ' - the file used to disable such rewriting'."\n\n".
               'This may be because '. $curr_rewrite.' has been '. 
               'previously customized, or it may be because of a change '.  
               'to the files in '.$rewrite_dir."\n");
           }
       }
 }  }
 </perlscript>  </perlscript>
 </file>  </file>
Removed from v.1.27  
changed lines
  Added in v.1.39

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