[LON-CAPA-cvs] cvs: doc /loncapafiles webserver.piml

raeburn raeburn at source.lon-capa.org
Thu Mar 11 15:38:05 EST 2021


raeburn		Thu Mar 11 20:38:05 2021 EDT

  Modified files:              
    /doc/loncapafiles	webserver.piml 
  Log:
  - For Ubuntu 14 and newer, Apache files in /etc/apache2/conf-available and
    /etc/apache2/sites-available are both named loncapa.conf.
  - For Ubuntu 14 and newer, symlinks in /etc/apache2/conf-enabled and
    /etc/apache2/sites-enabled which link to them also named loncapa.conf
    (for consistency with a2ensite, a2enconf, a2dissite, and a2disconf).
  
  
Index: doc/loncapafiles/webserver.piml
diff -u doc/loncapafiles/webserver.piml:1.54 doc/loncapafiles/webserver.piml:1.55
--- doc/loncapafiles/webserver.piml:1.54	Sun Sep  6 21:48:28 2020
+++ doc/loncapafiles/webserver.piml	Thu Mar 11 20:38:05 2021
@@ -2,7 +2,7 @@
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- webserver.piml -->
 
-<!-- $Id: webserver.piml,v 1.54 2020/09/06 21:48:28 raeburn Exp $ -->
+<!-- $Id: webserver.piml,v 1.55 2021/03/11 20:38:05 raeburn Exp $ -->
 
 <!--
 
@@ -48,7 +48,7 @@
 <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</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>
 <dependencies dist='default'>
 /etc/httpd/conf/httpd.conf
@@ -60,7 +60,7 @@
 /etc/apache2/sites-available/loncapa
 </dependencies>
 <dependencies dist='ubuntu14 ubuntu16 ubuntu18 ubuntu20'>
-/etc/apache2/conf-available/loncapa
+/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'>
 /etc/apache2/default-server.conf
@@ -69,6 +69,49 @@
 # Generated from doc/loncapafiles/webserver.piml
 use Socket;
 use Sys::Hostname::FQDN();
+
+# For ubuntu 14 and later check for loncapa.conf in sites-available,
+# and conf-available, and for symlinks in sites-enabled, and conf-enabled
+if ('<DIST />' =~ /^ubuntu(\d+)$/) {
+    my $version = $1;
+    if ($version > 12) {
+        if (-l '/etc/apache2/conf-enabled/loncapa.conf') {
+            my $linkfname = readlink('/etc/apache2/conf-enabled/loncapa.conf');
+            unless ($linkfname eq '/etc/apache2/conf-available/loncapa.conf') {
+                unlink('/etc/apache2/conf-enabled/loncapa.conf');
+            }
+        }
+        if (-e '/etc/apache2/conf-available/loncapa') {
+            system('mv /etc/apache2/conf-available/loncapa /etc/apache2/conf-available/loncapa.conf');
+        }
+        unless (-l '/etc/apache2/conf-enabled/loncapa.conf') {
+            if (-e '/etc/apache2/conf-available/loncapa.conf') {
+                symlink('/etc/apache2/conf-available/loncapa.conf','/etc/apache2/conf-enabled/loncapa.conf');
+            }
+        }
+        if (-l '/etc/apache2/sites-enabled/000-default.conf') {
+            my $linkfname = readlink('/etc/apache2/sites-enabled/000-default.conf');
+            if ($linkfname eq '/etc/apache2/sites-available/loncapa') {
+                unlink('/etc/apache2/sites-enabled/000-default.conf');
+            }
+        }
+        if (-e '/etc/apache2/sites-available/loncapa') {
+            system('mv /etc/apache2/sites-available/loncapa /etc/apache2/sites-available/loncapa.conf');
+        }
+        if (-l '/etc/apache2/sites-enabled/loncapa.conf') {
+            my $linkfname = readlink('/etc/apache2/sites-enabled/loncapa.conf');
+            unless ($linkfname eq '/etc/apache2/sites-available/loncapa.conf') {
+                unlink('/etc/apache2/sites-enabled/loncapa.conf');
+            }
+        }
+        unless (-l '/etc/apache2/sites-enabled/loncapa.conf') {
+            if (-e '/etc/apache2/sites-available/loncapa.conf') {
+                symlink('/etc/apache2/sites-available/loncapa.conf','/etc/apache2/sites-enabled/loncapa.conf');
+            }
+        }
+    }
+}
+
 unless (-e "<TARGET />") {
   print '**** ERROR! <TARGET /> should exist! Are you missing the Apache '.
     'software package?';
@@ -76,7 +119,7 @@
 }
 else {
   # Append loncapa_apache.conf inclusion to httpd.conf 
-  # (or sites-available/loncapa or conf-available/loncapa) if not present.
+  # (or sites-available/loncapa or conf-available/loncapa.conf) if not present.
   $flag=0;
   open(IN,'<<TARGET />');
   while (<IN>) { 
@@ -91,7 +134,7 @@
     close(OUT);
   }
   # Remove loncapa.conf inclusion from httpd.conf 
-  # (or sites-available/loncapa or conf-available/loncapa) if present.
+  # (or sites-available/loncapa or conf-available/loncapa.conf) if present.
   $flag=0;
   open(IN,'<<TARGET />');
   while (<IN>) {
@@ -142,6 +185,12 @@
           $conffile = '/etc/apache2/default-server.conf';
       } elsif ('<DIST />' =~ /^(debian|ubuntu)/) {
           $conffile = '/etc/apache2/sites-available/loncapa';
+          if ('<DIST />' =~ /^ubuntu(\d+)$/) {
+              my $version = $1;
+              if ($version > 12) {
+                  $conffile = '/etc/apache2/conf-available/loncapa.conf';
+              }
+          }
       }
       print('**** ERROR **** '.$conffile.' has an overlapping definition of '.
             'ScriptAlias (it is incorrectly set to '.$scriptalias.').'."\n".




More information about the LON-CAPA-cvs mailing list