[LON-CAPA-cvs] cvs: doc /install/linux install.pl

[raeburn]

raeburn		Fri Dec 19 14:34:36 2014 EDT

  Modified files:              
    /doc/install/linux	install.pl 
  Log:
  - Support for Ubuntu 14 LTS
    - Symlink now set correctly from conf-available/loncapa to 
      conf-available/loncapa.conf
    - Checking if Apache web server needs configuration now supports 
      checking of loncapa files in both conf-available and sites-available 
  
  
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.32 doc/install/linux/install.pl:1.33
--- doc/install/linux/install.pl:1.32	Wed Oct 29 20:56:18 2014
+++ doc/install/linux/install.pl	Fri Dec 19 14:34:36 2014
@@ -72,7 +72,7 @@
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.32 2014/10/29 20:56:18 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.33 2014/12/19 14:34:36 raeburn Exp $'."\n";
 }
 
 #
@@ -685,16 +685,26 @@
     if ($distro =~ /^(debian|ubuntu)(\d+)$/) {
         my $distname = $1;
         my $version = $2;
-        if (!-e "$instdir/debian-ubuntu/loncapa") {
+        my ($stdconf,$stdsite);
+        if (($distname eq 'ubuntu') && ($version > 12)) {
+            $stdconf = "$instdir/debian-ubuntu/ubuntu14/loncapa_conf";
+            $stdsite = "$instdir/debian-ubuntu/ubuntu14/loncapa_sites";
+        } else {
+            $stdconf = "$instdir/debian-ubuntu/loncapa"; 
+        }
+        if (!-e $stdconf) {
             $fixapache = 0;
             print &mt('Warning: No LON-CAPA Apache configuration file found for installation check.')."\n"; 
         } else {
-            my $configfile = "/etc/apache2/sites-available/loncapa";
+            my ($configfile,$sitefile);
             if (($distname eq 'ubuntu') && ($version > 12)) {
+                $sitefile = '/etc/apache2/sites-available/loncapa';
                 $configfile = "/etc/apache2/conf-available/loncapa";
+            } else {
+                $configfile = "/etc/apache2/sites-available/loncapa";
             }
-            if (-e $configfile) {
-                if (open(PIPE, "diff --brief $instdir/debian-ubuntu/loncapa $configfile |")) {
+            if (($configfile ne '') && (-e $configfile) && (-e $stdconf))  {
+                if (open(PIPE, "diff --brief $stdconf $configfile |")) {
                     my $diffres = <PIPE>;
                     close(PIPE);
                     chomp($diffres);
@@ -703,6 +713,18 @@
                     }
                 }
             }
+            if ((!$fixapache) && ($distname eq 'ubuntu') && ($version > 12)) {
+                if (($sitefile ne '') && (-e $sitefile) && (-e $stdsite)) {
+                    if (open(PIPE, "diff --brief $stdsite $sitefile |")) {
+                        my $diffres = <PIPE>;
+                        close(PIPE);
+                        chomp($diffres);
+                        unless ($diffres) {
+                            $fixapache = 0;
+                        }
+                    }
+                }
+            }
         }
         if (!$fixapache) {
             foreach my $module ('headers.load','expires.load') {
@@ -1855,7 +1877,7 @@
         if (-e "$apache2_conf_available_dir/loncapa") {
             copy("$apache2_conf_available_dir/loncapa","$apache2_conf_available_dir/loncapa.original");
         }
-        my $defaultconf = $apache2_conf_available_dir.'/loncapa.conf';
+        my $defaultconf = $apache2_conf_enabled_dir.'/loncapa.conf';
         copy("$instdir/debian-ubuntu/ubuntu14/loncapa_conf","$apache2_conf_available_dir/loncapa");
         chmod(0444,"$apache2_conf_available_dir/loncapa");
         if (-l $defaultconf) {