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

Diff for /doc/loncapafiles/webserver.piml between versions 1.43.2.13 and 1.55

version 1.43.2.13, 2024/08/05 15:55:00 version 1.55, 2021/03/11 20:38:05
Line 48  http://www.lon-capa.org/ Line 48  http://www.lon-capa.org/
 <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 sles11 sles12 sles15 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2'>/etc/apache2/default-server.conf</target>  <target dist='sles10 sles11 sles12 sles15 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2'>/etc/apache2/default-server.conf</target>
 <target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/etc/apache2/sites-available/loncapa</target>  <target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/etc/apache2/sites-available/loncapa</target>
 <target dist='debian10 debian11 debian12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>/etc/apache2/conf-available/loncapa.conf</target>  <target dist='ubuntu14 ubuntu16 ubuntu18 ubuntu20'>/etc/apache2/conf-available/loncapa.conf</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, Oracle Linux 5, SuSE 10.1, SLES 10, Debian 5, Ubuntu LTS 8 and later distributions</note>  <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, Oracle 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
Line 59  http://www.lon-capa.org/ Line 59  http://www.lon-capa.org/
 <dependencies dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>  <dependencies dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>
 /etc/apache2/sites-available/loncapa  /etc/apache2/sites-available/loncapa
 </dependencies>  </dependencies>
 <dependencies dist='debian10 debian11 debian12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>  <dependencies dist='ubuntu14 ubuntu16 ubuntu18 ubuntu20'>
 /etc/apache2/conf-available/loncapa.conf  /etc/apache2/conf-available/loncapa.conf
 </dependencies>  </dependencies>
 <dependencies dist='sles10 sles11 sles12 sles15 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2'>  <dependencies dist='sles10 sles11 sles12 sles15 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1 suse13.2'>
Line 69  http://www.lon-capa.org/ Line 69  http://www.lon-capa.org/
 # Generated from doc/loncapafiles/webserver.piml  # Generated from doc/loncapafiles/webserver.piml
 use Socket;  use Socket;
 use Sys::Hostname::FQDN();  use Sys::Hostname::FQDN();
 use File::Spec;  
 use Cwd();  
   
 # For ubuntu 14 and later check for loncapa.conf in sites-available,  # For ubuntu 14 and later check for loncapa.conf in sites-available,
 # and conf-available, and for symlinks in sites-enabled, and conf-enabled  # and conf-available, and for symlinks in sites-enabled, and conf-enabled
Line 79  if ('<DIST />' =~ /^ubuntu(\d+)$/) { Line 77  if ('<DIST />' =~ /^ubuntu(\d+)$/) {
     if ($version &gt; 12) {      if ($version &gt; 12) {
         if (-l '/etc/apache2/conf-enabled/loncapa.conf') {          if (-l '/etc/apache2/conf-enabled/loncapa.conf') {
             my $linkfname = readlink('/etc/apache2/conf-enabled/loncapa.conf');              my $linkfname = readlink('/etc/apache2/conf-enabled/loncapa.conf');
             if ($linkfname ne '') {  
                 $linkfname = Cwd::abs_path(File::Spec->rel2abs($linkfname,'/etc/apache2/conf-enabled'));  
             }  
             unless ($linkfname eq '/etc/apache2/conf-available/loncapa.conf') {              unless ($linkfname eq '/etc/apache2/conf-available/loncapa.conf') {
                 unlink('/etc/apache2/conf-enabled/loncapa.conf');                  unlink('/etc/apache2/conf-enabled/loncapa.conf');
             }              }
Line 91  if ('<DIST />' =~ /^ubuntu(\d+)$/) { Line 86  if ('<DIST />' =~ /^ubuntu(\d+)$/) {
         }          }
         unless (-l '/etc/apache2/conf-enabled/loncapa.conf') {          unless (-l '/etc/apache2/conf-enabled/loncapa.conf') {
             if (-e '/etc/apache2/conf-available/loncapa.conf') {              if (-e '/etc/apache2/conf-available/loncapa.conf') {
                 my $currdir = Cwd::getcwd();                  symlink('/etc/apache2/conf-available/loncapa.conf','/etc/apache2/conf-enabled/loncapa.conf');
                 if ($currdir ne '') {  
                     chdir('/etc/apache2/conf-enabled');  
                     symlink('../conf-available/loncapa.conf','loncapa.conf');  
                     chdir($currdir);  
                 }  
             }              }
         }          }
         if (-l '/etc/apache2/sites-enabled/000-default.conf') {          if (-l '/etc/apache2/sites-enabled/000-default.conf') {
             my $linkfname = readlink('/etc/apache2/sites-enabled/000-default.conf');              my $linkfname = readlink('/etc/apache2/sites-enabled/000-default.conf');
             if ($linkfname ne '') {              if ($linkfname eq '/etc/apache2/sites-available/loncapa') {
                 $linkfname = Cwd::abs_path(File::Spec->rel2abs($linkfname,'/etc/apache2/sites-enabled'));  
             }  
             if (($linkfname eq '/etc/apache2/sites-available/loncapa') ||  
                 ($linkfname eq '/etc/apache2/sites-available/000-default.conf')) {  
                 unlink('/etc/apache2/sites-enabled/000-default.conf');                  unlink('/etc/apache2/sites-enabled/000-default.conf');
             }              }
         }          }
Line 114  if ('<DIST />' =~ /^ubuntu(\d+)$/) { Line 100  if ('<DIST />' =~ /^ubuntu(\d+)$/) {
         }          }
         if (-l '/etc/apache2/sites-enabled/loncapa.conf') {          if (-l '/etc/apache2/sites-enabled/loncapa.conf') {
             my $linkfname = readlink('/etc/apache2/sites-enabled/loncapa.conf');              my $linkfname = readlink('/etc/apache2/sites-enabled/loncapa.conf');
             if ($linkfname ne '') {  
                 $linkfname = Cwd::abs_path(File::Spec->rel2abs($linkfname,'/etc/apache2/sites-enabled'));  
             }  
             unless ($linkfname eq '/etc/apache2/sites-available/loncapa.conf') {              unless ($linkfname eq '/etc/apache2/sites-available/loncapa.conf') {
                 unlink('/etc/apache2/sites-enabled/loncapa.conf');                  unlink('/etc/apache2/sites-enabled/loncapa.conf');
             }              }
         }          }
         unless (-l '/etc/apache2/sites-enabled/loncapa.conf') {          unless (-l '/etc/apache2/sites-enabled/loncapa.conf') {
             if (-e '/etc/apache2/sites-available/loncapa.conf') {              if (-e '/etc/apache2/sites-available/loncapa.conf') {
                 my $currdir = Cwd::getcwd();                  symlink('/etc/apache2/sites-available/loncapa.conf','/etc/apache2/sites-enabled/loncapa.conf');
                 if ($currdir ne '') {  
                     chdir('/etc/apache2/sites-enabled');  
                     symlink('../sites-available/loncapa.conf','loncapa.conf');  
                     chdir($currdir);  
                 }  
             }              }
         }          }
     }      }
Line 142  unless (-e "<TARGET />") { Line 120  unless (-e "<TARGET />") {
 else {  else {
   # Append loncapa_apache.conf inclusion to httpd.conf     # Append loncapa_apache.conf inclusion to httpd.conf 
   # (or sites-available/loncapa or conf-available/loncapa.conf) if not present.    # (or sites-available/loncapa or conf-available/loncapa.conf) if not present.
   my $absolute_link;    $flag=0;
   if ('<DIST />' =~ /^sles(\d+)$/) {    open(IN,'&lt;<TARGET />');
     my $version = $1;    while (&lt;IN&gt;) { 
     if ($version &gt; 11) {      if (/^\s*Include\s+conf\/loncapa_apache.conf/) {
       $absolute_link = 1;        $flag=1; 
     }      }
   }    }
   if ($absolute_link) {     close(IN);
     # For SuSE and SLES /etc/apache2/default-server.conf needs to include:    unless ($flag==1) {
     # Include /etc/apache2/loncapa_apache.conf      open(OUT,'&gt;&gt;<TARGET />');
     # instead of:      print(OUT 'Include conf/loncapa_apache.conf'."\n");
     # Include conf/loncapa_apache.conf      close(OUT);
     my $delflag=0;  
     my $addflag=1;  
     open(IN,'&lt;<TARGET />');  
     while (&lt;IN&gt;) {  
       if (/^\s*Include\s+conf\/loncapa_apache.conf/) {  
         $delflag=1;  
       }  
       if (/^\s*Include\s+\/etc\/apache2\/loncapa_apache.conf/) {  
         $addflag = 0;  
       }  
     }  
     close(IN);  
     if ($addflag) {  
       open(OUT,'&gt;&gt;<TARGET />');  
       print(OUT 'Include /etc/apache2/loncapa_apache.conf'."\n");  
       close(OUT);  
     }  
     if ($delflag==1) {  
       my $in='';  
       open(IN,'&lt;<TARGET />');  
       while(&lt;IN&gt;) {  
         $in.=$_ unless /^\s*Include\s+conf\/loncapa_apache.conf/;  
       }  
       close(IN);  
       open(OUT,'&gt;<TARGET />');  
       print(OUT $in);  
       close(OUT);  
     }  
   } else {  
     $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     # Remove loncapa.conf inclusion from httpd.conf 
   # (or sites-available/loncapa or conf-available/loncapa.conf) if present.    # (or sites-available/loncapa or conf-available/loncapa.conf) if present.
Removed from v.1.43.2.13  
changed lines
  Added in v.1.55

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