--- doc/install/linux/install.pl	2015/01/02 13:34:08	1.35
+++ doc/install/linux/install.pl	2017/03/29 21:00:44	1.40
@@ -72,7 +72,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.35 2015/01/02 13:34:08 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.40 2017/03/29 21:00:44 raeburn Exp $'."\n";
 }
 
 #
@@ -450,10 +450,16 @@ sub check_mysql_running {
         }
     } elsif ($distro =~ /^fedora(\d+)/) {
         if ($1 >= 16) {
+            if ($1 >= 19) {
+                $mysqldaemon ='mariadb';
+            }
             $process = 'mysqld';
             $proc_owner = 'mysql';
             $use_systemctl = 1;
         }
+        if ($1 >= 19) {
+            $mysqldaemon ='mariadb';
+        }
     } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
         if ($1 >= 7) {
             $mysqldaemon ='mariadb';
@@ -574,6 +580,9 @@ sub chkconfig {
             $uses_systemctl{'memcached'} = 1;
             $uses_systemctl{'cups'} = 1;
         }
+        if ($version >= 19) {
+            $daemon{'mysql'} = 'mariadb';
+        }
     } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
         my $version = $1;
         if ($version >= 7) {
@@ -1780,8 +1789,23 @@ CREATE TABLE IF NOT EXISTS metadata (tit
 
 sub setup_mysql_permissions {
     my ($dbh,$has_pass,@mysql_lc_commands) = @_;
-    my $mysqlversion = &get_mysql_version();
-    my @mysql_commands = ("INSERT user (Host, User, Password) VALUES('localhost','www',password('localhostkey'));");
+    my ($mysqlversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
+    my ($usesauth,@mysql_commands);
+    if ($mysqlname =~ /^MariaDB/i) {
+        if ($mysqlversion >= 10.2) {
+            $usesauth = 1;
+        }
+    } else {
+        if (($mysqlversion > 5.7) || (($mysqlversion == 5.7) && ($mysqlsubver > 5))) {
+            $usesauth = 1;
+        }
+    }
+    if ($usesauth) {
+        @mysql_commands = ("INSERT user (Host, User, ssl_cipher, x509_issuer, x509_subject) VALUES('localhost','www','','','')",
+                         "ALTER USER 'www'\@'localhost' IDENTIFIED BY 'localhostkey'");
+    } else {
+        @mysql_commands = ("INSERT user (Host, User, Password) VALUES('localhost','www',password('localhostkey'));");
+    }
     if ($mysqlversion < 4) {
         push (@mysql_commands,"
 INSERT db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Grant_priv,References_priv,Index_priv,Alter_priv) VALUES('localhost','loncapa','www','Y','Y','Y','Y','Y','Y','N','Y','Y','Y')");
@@ -1862,23 +1886,28 @@ INSERT db (Host,Db,User,Select_priv,Inse
 }
 
 sub new_mysql_rootpasswd {
-    my ($currmysqlpass) = @_;
-    return ("SET PASSWORD FOR 'root'\@'localhost'=PASSWORD('$currmysqlpass')",
-            "FLUSH PRIVILEGES;");
+    my ($currmysqlpass,$usesauth) = @_;
+    if ($usesauth) {
+        return ("ALTER USER 'root'\@'localhost' IDENTIFIED BY '$currmysqlpass'",
+                "FLUSH PRIVILEGES;");
+    } else {
+        return ("SET PASSWORD FOR 'root'\@'localhost'=PASSWORD('$currmysqlpass')",
+                "FLUSH PRIVILEGES;");
+    }
 }
 
 sub get_mysql_version {
-    my $version;
+    my ($version,$subversion,$name);
     if (open(PIPE," mysql -V |")) {
         my $info = <PIPE>;
         chomp($info);
         close(PIPE);
-        ($version) = ($info =~ /(\d+\.\d+)\.\d+[\-\w]*,/);
+        ($version,$subversion,$name) = ($info =~ /(\d+\.\d+)\.(\d+)\-?(\w*),/);
     } else {
         print &mt('Could not determine which version of MySQL is installed.').
               "\n";
     }
-    return $version;
+    return ($version,$subversion,$name);
 }
 
 ###########################################################