--- doc/install/linux/install.pl	2013/02/27 19:48:53	1.25
+++ doc/install/linux/install.pl	2014/12/19 14:34:36	1.33
@@ -72,7 +72,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.25 2013/02/27 19:48:53 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.33 2014/12/19 14:34:36 raeburn Exp $'."\n";
 }
 
 #
@@ -330,6 +330,16 @@ sub check_locale {
             print &mt('Failed to open: [_1], default locale not checked.',
                       '/etc/sysconfig/i18n');
         }
+    } elsif ($distro =~ /^(?:rhes|centos|scientific)(\d+)/) {
+        if ($1 >= 7) {
+            if (!open($fh,"</etc/locale.conf")) {
+                print &mt('Failed to open: [_1], default locale not checked.',
+                          '/etc/locale.conf');
+            }
+        } elsif (!open($fh,"</etc/sysconfig/i18n")) {
+            print &mt('Failed to open: [_1], default locale not checked.',
+                      '/etc/sysconfig/i18n');
+        }
     } else {
         if (!open($fh,"</etc/sysconfig/i18n")) {
             print &mt('Failed to open: [_1], default locale not checked.',
@@ -437,6 +447,14 @@ sub check_mysql_running {
             $use_systemctl = 1;
         }
     }
+    if ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
+        if ($1 >= 7) {
+            $mysqldaemon ='mariadb';
+            $process = 'mysqld';
+            $proc_owner = 'mysql';
+            $use_systemctl = 1;
+        }
+    }
     if (open(PIPE,"ps -ef |grep $process |grep -v grep 2>&1 |")) {
         my $status = <PIPE>;
         close(PIPE);
@@ -505,6 +523,11 @@ sub chkconfig {
         if ($distro =~ /^(suse|sles)9/) {
             $daemon{'apache'} = 'apache';
         }
+        if ($distro =~ /^suse(\d+)/) {
+            if ($1 > 11) {
+                $uses_systemctl{'apache'} = 1;
+            }
+        }
     } elsif ($distro =~ /^(?:debian|ubuntu)(\d+)/) {
         my $version = $1;
         @runlevels = qw/2 3 4 5/;
@@ -516,7 +539,7 @@ sub chkconfig {
         if (($distro =~ /^ubuntu/) && ($version <= 8)) {
             $daemon{'cups'} = 'cupsys';
         }
-    } elsif ($distro =~ /^(?:fedora)(\d+)/) {
+    } elsif ($distro =~ /^fedora(\d+)/) {
         my $version = $1;
         if ($version >= 15) {
             $uses_systemctl{'ntp'} = 1;
@@ -525,6 +548,14 @@ sub chkconfig {
             $uses_systemctl{'mysql'} = 1;
             $uses_systemctl{'apache'} = 1;
         }
+    } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
+        my $version = $1;
+        if ($version >= 7) {
+            $uses_systemctl{'ntp'} = 1;
+            $uses_systemctl{'mysql'} = 1;
+            $uses_systemctl{'apache'} = 1;
+            $daemon{'mysql'} = 'mariadb';
+        }
     }
     my $nocheck;
     if (! -x $checker_bin) {
@@ -651,17 +682,47 @@ sub chkfirewall {
 sub chkapache {
     my ($distro,$instdir) = @_;
     my $fixapache = 1;
-    if ($distro =~ /^(debian|ubuntu)/) {
-        if (!-e "$instdir/debian-ubuntu/loncapa") {
+    if ($distro =~ /^(debian|ubuntu)(\d+)$/) {
+        my $distname = $1;
+        my $version = $2;
+        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"; 
-        } elsif ((-e "/etc/apache2/sites-available/loncapa") && (-e "$instdir/debian-ubuntu/loncapa")) {
-            if (open(PIPE, "diff --brief $instdir/debian-ubuntu/loncapa /etc/apache2/sites-available/loncapa |")) {
-                my $diffres = <PIPE>;
-                close(PIPE);
-                chomp($diffres);
-                unless ($diffres) {
-                    $fixapache = 0;
+        } else {
+            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 (($configfile ne '') && (-e $configfile) && (-e $stdconf))  {
+                if (open(PIPE, "diff --brief $stdconf $configfile |")) {
+                    my $diffres = <PIPE>;
+                    close(PIPE);
+                    chomp($diffres);
+                    unless ($diffres) {
+                        $fixapache = 0;
+                    }
+                }
+            }
+            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;
+                        }
+                    }
                 }
             }
         }
@@ -707,11 +768,15 @@ sub chkapache {
     } else {
         my $configfile = 'httpd.conf';
         if ($distro =~ /^(?:centos|rhes|scientific)(\d+)$/) {
-            if ($1 > 5) {
+            if ($1 >= 7) {
+                $configfile = 'apache2.4/httpd.conf';
+            } elsif ($1 > 5) {
                 $configfile = 'new/httpd.conf';
             }
         } elsif ($distro =~ /^fedora(\d+)$/) {
-            if ($1 > 10) {
+            if ($1 > 17) {
+                $configfile = 'apache2.4/httpd.conf'; 
+            } elsif ($1 > 10) {
                 $configfile = 'new/httpd.conf';
             }
         }
@@ -1315,7 +1380,7 @@ if ($callsub{'apache'}) {
     if ($distro =~ /^(suse|sles)/) {
         &copy_apache2_suseconf($instdir);
     } elsif ($distro =~ /^(debian|ubuntu)/) {
-        &copy_apache2_debconf($instdir);
+        &copy_apache2_debconf($instdir,$distro);
     } else {
         &copy_httpd_conf($instdir,$distro);
     }
@@ -1754,11 +1819,15 @@ sub copy_httpd_conf {
     my ($instdir,$distro) = @_;
     my $configfile = 'httpd.conf';
     if ($distro =~ /^(?:centos|rhes|scientific)(\d+)$/) {
-        if ($1 > 5) {
+        if ($1 >= 7) {
+            $configfile = 'apache2.4/httpd.conf';
+        } elsif ($1 > 5) {
             $configfile = 'new/httpd.conf';
         }
     } elsif ($distro =~ /^fedora(\d+)$/) {
-        if ($1 > 10) {
+        if ($1 > 17) {
+            $configfile = 'apache2.4/httpd.conf';
+        } elsif ($1 > 10) {
             $configfile = 'new/httpd.conf';
         }
     }
@@ -1778,19 +1847,7 @@ sub copy_httpd_conf {
 #########################################################
 
 sub copy_apache2_debconf {
-    my ($instdir) = @_;
-    print_and_log(&mt('Copying loncapa [_1] config file to [_2] and pointing [_3] to it from sites-enabled.',"'apache2'","'/etc/apache2/sites-available'","'000-default symlink'")."\n");
-    my $apache2_sites_enabled_dir = '/etc/apache2/sites-enabled';
-    my $apache2_sites_available_dir = '/etc/apache2/sites-available';
-    if (-l "$apache2_sites_enabled_dir/000-default") {
-        unlink("$apache2_sites_enabled_dir/000-default");
-    }
-    if (-e "$apache2_sites_available_dir/loncapa") {
-        copy("$apache2_sites_available_dir/loncapa","$apache2_sites_available_dir/loncapa.original");
-    }
-    copy("$instdir/debian-ubuntu/loncapa","$apache2_sites_available_dir/loncapa");
-    chmod(0444,"$apache2_sites_available_dir/loncapa");
-    symlink("$apache2_sites_available_dir/loncapa","$apache2_sites_enabled_dir/000-default");
+    my ($instdir,$distro) = @_;
     my $apache2_mods_enabled_dir = '/etc/apache2/mods-enabled';
     my $apache2_mods_available_dir = '/etc/apache2/mods-available';
     foreach my $module ('headers.load','expires.load') {
@@ -1799,6 +1856,47 @@ sub copy_apache2_debconf {
             print_and_log(&mt('Enabling "[_1]" Apache module.',$module)."\n");
         }
     }
+    my $apache2_sites_enabled_dir = '/etc/apache2/sites-enabled';
+    my $apache2_sites_available_dir = '/etc/apache2/sites-available';
+    my $defaultconfig = "$apache2_sites_enabled_dir/000-default";
+    my ($distname,$version);
+    if ($distro =~ /^(debian|ubuntu)(\d+)$/) {
+        $distname = $1;
+        $version = $2;
+    }
+    if (($distname eq 'ubuntu') && ($version > 12)) {
+        $defaultconfig = "$apache2_sites_enabled_dir/000-default.conf";
+    }
+    if (-l $defaultconfig) {
+        unlink($defaultconfig);
+    }
+    if (($distname eq 'ubuntu') && ($version > 12)) {
+        print_and_log(&mt('Copying loncapa [_1] config file to [_2] and pointing [_3] to it from conf-enabled.',"'apache2'","'/etc/apache2/conf-available'","'loncapa.conf symlink'")."\n");
+        my $apache2_conf_enabled_dir = '/etc/apache2/conf-enabled';
+        my $apache2_conf_available_dir = '/etc/apache2/conf-available';
+        if (-e "$apache2_conf_available_dir/loncapa") {
+            copy("$apache2_conf_available_dir/loncapa","$apache2_conf_available_dir/loncapa.original");
+        }
+        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) {
+            unlink($defaultconf);
+        }
+        symlink("$apache2_conf_available_dir/loncapa","$defaultconf");
+        print_and_log(&mt('Copying loncapa [_1] site file to [_2] and pointing [_3] to it from sites-enabled.',"'apache2'","'/etc/apache2/sites-available'","'000-default.conf symlink'")."\n");
+        copy("$instdir/debian-ubuntu/ubuntu14/loncapa_site","$apache2_sites_available_dir/loncapa");
+        chmod(0444,"$apache2_sites_available_dir/loncapa");
+        symlink("$apache2_sites_available_dir/loncapa","$defaultconfig");
+    } else {
+        print_and_log(&mt('Copying loncapa [_1] config file to [_2] and pointing [_3] to it from sites-enabled.',"'apache2'","'/etc/apache2/sites-available'","'000-default symlink'")."\n");
+        if (-e "$apache2_sites_available_dir/loncapa") {
+            copy("$apache2_sites_available_dir/loncapa","$apache2_sites_available_dir/loncapa.original");
+        }
+        copy("$instdir/debian-ubuntu/loncapa","$apache2_sites_available_dir/loncapa");
+        chmod(0444,"$apache2_sites_available_dir/loncapa");
+        symlink("$apache2_sites_available_dir/loncapa","$apache2_sites_enabled_dir/000-default");
+    }
     print_and_log("\n");
 }