doc/loncapafiles/webserver.piml - diff

Return to webserver.piml CVS log

Up to [LON-CAPA] / doc / loncapafiles

Diff for /doc/loncapafiles/webserver.piml between versions 1.43.2.10 and 1.62

-version 1.43.2.10, 2021/03/12 23:17:04
+version 1.62, 2024/08/05 15:45:16
  Line 48  http://www.lon-capa.org/
  <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='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>/etc/apache2/sites-available/loncapa</target>
- <target dist='ubuntu14 ubuntu16 ubuntu18 ubuntu20'>/etc/apache2/conf-available/loncapa.conf</target>
+ <target dist='debian10 debian11 debian12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>/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>
  <dependencies dist='default'>
  /etc/httpd/conf/httpd.conf
  Line 59  http://www.lon-capa.org/
  <dependencies dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>
  /etc/apache2/sites-available/loncapa
  </dependencies>
- <dependencies dist='ubuntu14 ubuntu16 ubuntu18 ubuntu20'>
+ <dependencies dist='debian10 debian11 debian12 ubuntu14 ubuntu16 ubuntu18 ubuntu20 ubuntu22 ubuntu24'>
  /etc/apache2/conf-available/loncapa.conf
  </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'>
  Line 105  if ('<DIST />' =~ /^ubuntu(\d+)$/) {
                  $linkfname = Cwd::abs_path(File::Spec->rel2abs($linkfname,'/etc/apache2/sites-enabled'));
              }
              if (($linkfname eq '/etc/apache2/sites-available/loncapa') ||
-                 ($linkname eq '/etc/apache2/sites-available/000-default.conf')) {
+                 ($linkfname eq '/etc/apache2/sites-available/000-default.conf')) {
                  unlink('/etc/apache2/sites-enabled/000-default.conf');
              }
          }
  Line 142  unless (-e "<TARGET />") {
  else {
    # Append loncapa_apache.conf inclusion to httpd.conf
    # (or sites-available/loncapa or conf-available/loncapa.conf) if not present.
-   $flag=0;
+   my $absolute_link;
-   open(IN,'&lt;<TARGET />');
+   if ('<DIST />' =~ /^sles(\d+)$/) {
-   while (&lt;IN&gt;) {
+     my $version = $1;
-     if (/^\s*Include\s+conf\/loncapa_apache.conf/) {
+     if ($version &gt; 11) {
-       $flag=1;
+       $absolute_link = 1;
      }
    }
-   close(IN);
+   if ($absolute_link) {
-   unless ($flag==1) {
+     # For SuSE and SLES /etc/apache2/default-server.conf needs to include:
-     open(OUT,'&gt;&gt;<TARGET />');
+     # Include /etc/apache2/loncapa_apache.conf
-     print(OUT 'Include conf/loncapa_apache.conf'."\n");
+     # instead of:
-     close(OUT);
+     # Include conf/loncapa_apache.conf
+     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
    # (or sites-available/loncapa or conf-available/loncapa.conf) if present.

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

Removed from v.1.43.2.10
changed lines
	Added in v.1.62