--- doc/install/linux/install.pl	2014/06/04 00:25:32	1.28
+++ doc/install/linux/install.pl	2014/12/19 20:23:36	1.34
@@ -72,7 +72,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.28 2014/06/04 00:25:32 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.34 2014/12/19 20:23: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.',
@@ -375,8 +385,8 @@ sub check_required {
     unless ($localecmd eq '') {
         return ($distro,$gotprereqs,$localecmd);
     }
-    my ($mysqlon,$mysqlsetup,$dbh,$has_pass,$has_lcdb,%recommended,$downloadstatus,
-        $filetouse,$production,$testing,$apachefw,$tostop);
+    my ($mysqlon,$mysqlsetup,$mysqlrestart,$dbh,$has_pass,$has_lcdb,%recommended,
+        $downloadstatus,$filetouse,$production,$testing,$apachefw,$tostop);
     my $wwwuid = &uid_of_www();
     my $wwwgid = getgrnam('www');
     if (($wwwuid eq '') || ($wwwgid eq '')) {
@@ -388,20 +398,29 @@ sub check_required {
     $mysqlon = &check_mysql_running($distro);
     if ($mysqlon) {
         my $mysql_has_wwwuser = &check_mysql_wwwuser();
-        ($mysqlsetup,$has_pass,$dbh) = 
-            &check_mysql_setup($instdir,$dsn);
-        if ($mysqlsetup eq 'noroot') {
-            $recommended{'mysqlperms'} = 1;
+        ($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser) = 
+            &check_mysql_setup($instdir,$dsn,$distro,$mysql_has_wwwuser);
+        if ($mysqlsetup eq 'needsrestart') {
+            $mysqlrestart = '';
+            if ($distro eq 'ubuntu') {
+                $mysqlrestart = 'sudo '; 
+            }
+            $mysqlrestart .= 'service mysql restart';
+            return ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,$mysqlrestart);
         } else {
-            unless ($mysql_has_wwwuser) {
+            if ($mysqlsetup eq 'noroot') {
                 $recommended{'mysqlperms'} = 1;
+            } else {
+                unless ($mysql_has_wwwuser) {
+                    $recommended{'mysqlperms'} = 1;
+                }
+            }
+            if ($dbh) {
+                $has_lcdb = &check_loncapa_mysqldb($dbh);
+            }
+            unless ($has_lcdb) {
+                $recommended{'mysql'} = 1;
             }
-        }
-        if ($dbh) {
-            $has_lcdb = &check_loncapa_mysqldb($dbh);
-        }
-        unless ($has_lcdb) {
-            $recommended{'mysql'} = 1;
         }
     }
     ($recommended{'firewall'},$apachefw) = &chkfirewall($distro);
@@ -411,7 +430,7 @@ sub check_required {
     ($recommended{'download'},$downloadstatus,$filetouse,$production,$testing) 
         = &need_download();
     return ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,
-            \%recommended,$dbh,$has_pass,$has_lcdb,$downloadstatus,
+            $mysqlrestart,\%recommended,$dbh,$has_pass,$has_lcdb,$downloadstatus,
             $filetouse,$production,$testing,$apachefw);
 }
 
@@ -437,7 +456,15 @@ sub check_mysql_running {
             $use_systemctl = 1;
         }
     }
-    if (open(PIPE,"ps -ef |grep $process |grep -v grep 2>&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 ^$proc_owner 2>&1 |")) {
         my $status = <PIPE>;
         close(PIPE);
         chomp($status);
@@ -530,6 +557,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) {
@@ -659,16 +694,26 @@ sub chkapache {
     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 /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);
@@ -677,6 +722,18 @@ sub chkapache {
                     }
                 }
             }
+            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') {
@@ -720,11 +777,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';
             }
         }
@@ -870,13 +931,36 @@ sub need_download {
 }
 
 sub check_mysql_setup {
-    my ($instdir,$dsn) = @_;
+    my ($instdir,$dsn,$distro,$mysql_has_wwwuser) = @_;
     my ($mysqlsetup,$has_pass);
     my $dbh = DBI->connect($dsn,'root','',{'PrintError'=>0});
     if ($dbh) {
         $mysqlsetup = 'noroot'; 
     } elsif ($DBI::err =~ /1045/) {
         $has_pass = 1;
+    } elsif ($distro =~ /^ubuntu(\d+)$/) {
+        my $version = $1;
+        if ($1 > 12) {
+            print_and_log(&mt('Restarting mysql, please be patient')."\n");
+            if (open (PIPE, "service mysql restart 2>&1 |")) {
+                while (<PIPE>) {
+                    print $_;
+                }
+                close(PIPE);
+            }
+            unless ($mysql_has_wwwuser) {
+                $mysql_has_wwwuser = &check_mysql_wwwuser();
+            }
+            $dbh = DBI->connect($dsn,'root','',{'PrintError'=>0});
+            if ($dbh) {
+                $mysqlsetup = 'noroot';
+            } elsif ($DBI::err =~ /1045/) {
+                $has_pass = 1;
+            } else {
+                $mysqlsetup = 'needsrestart';
+                return ($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser);
+            }
+        }
     }
     if ($has_pass) {
         print &mt('You have already set a root password for the MySQL database.')."\n";
@@ -903,11 +987,11 @@ sub check_mysql_setup {
                 }
             }
         }
-     } elsif ($mysqlsetup ne 'noroot') {
+    } elsif ($mysqlsetup ne 'noroot') {
         print_and_log(&mt('Problem accessing MySQL.')."\n");
         $mysqlsetup = 'rootfail';
     }
-    return ($mysqlsetup,$has_pass,$dbh);
+    return ($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser);
 }
 
 sub check_mysql_wwwuser {
@@ -1163,8 +1247,8 @@ my %prompts = &texthash(
 print "\n".&mt('Checking system status ...')."\n";
 
 my $dsn = "DBI:mysql:database=mysql";
-my ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,$recommended,
-    $dbh,$has_pass,$has_lcdb,$downloadstatus,$filetouse,$production,
+my ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,$mysqlrestart,
+    $recommended,$dbh,$has_pass,$has_lcdb,$downloadstatus,$filetouse,$production,
     $testing,$apachefw) = &check_required($instdir,$dsn);
 if ($distro eq '') {
     print "\n".&mt('Linux distribution could not be verified as a supported distribution.')."\n".
@@ -1174,6 +1258,13 @@ if ($distro eq '') {
           &mt('Stopping execution.')."\n";
     exit;
 }
+if ($mysqlrestart) {
+    print "\n".&mt('The mysql daemon needs to be restarted using the following command:')."\n".
+          $mysqlrestart."\n\n".
+          &mt('Stopping execution of install.pl script.')."\n".
+          &mt('Please run the install.pl script again, once you have restarted mysql.')."\n";
+    exit;
+}
 if ($localecmd ne '') {
     print "\n".&mt('Although the LON-CAPA application itself is localized for a number of different languages, the default locale language for the Linux OS on which it runs should be US English.')."\n";
     print "\n".&mt('Run the following command from the command line to set the default language for your OS, and then run this LON-CAPA installation set-up script again.')."\n\n".
@@ -1201,7 +1292,7 @@ if (!$gotprereqs) {
                     exit;
                 } else {
                     ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,
-                     $recommended,$dbh,$has_pass,$has_lcdb,$downloadstatus,
+                     $mysqlrestart,$recommended,$dbh,$has_pass,$has_lcdb,$downloadstatus,
                      $filetouse,$production,$testing,$apachefw) = 
                      &check_required($instdir,$dsn);
                 }
@@ -1767,11 +1858,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';
         }
     }
@@ -1815,15 +1910,23 @@ sub copy_apache2_debconf {
         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 symlink'")."\n");
+        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");
         }
-        copy("$instdir/debian-ubuntu/loncapa","$apache2_conf_available_dir/loncapa");
+        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");
-        symlink("$apache2_conf_available_dir/loncapa","$apache2_conf_enabled_dir/loncapa.conf");
+        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") {