--- doc/install/linux/install.pl	2016/08/09 15:20:45	1.37
+++ doc/install/linux/install.pl	2018/06/19 11:35:12	1.44
@@ -27,6 +27,9 @@ use strict;
 use File::Copy;
 use Term::ReadKey;
 use DBI;
+use Cwd();
+use File::Basename();
+use lib File::Basename::dirname(Cwd::abs_path($0));
 use LCLocalization::localize;
 
 # ========================================================= The language handle
@@ -72,7 +75,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.37 2016/08/09 15:20:45 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.44 2018/06/19 11:35:12 raeburn Exp $'."\n";
 }
 
 #
@@ -454,7 +457,7 @@ sub check_mysql_running {
             $proc_owner = 'mysql';
             $use_systemctl = 1;
         }
-        if ($1 >= 22) {
+        if ($1 >= 19) {
             $mysqldaemon ='mariadb';
         }
     } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
@@ -467,6 +470,8 @@ sub check_mysql_running {
     } elsif ($distro =~ /^sles(\d+)/) {
         if ($1 >= 12) {
             $use_systemctl = 1;
+            $proc_owner = 'mysql';
+            $process = 'mysqld';
         }
     } elsif ($distro =~ /^suse(\d+)/) {
         if ($1 >= 13) {
@@ -559,7 +564,15 @@ sub chkconfig {
         my $version = $1;
         @runlevels = qw/2 3 4 5/;
         @norunlevels = qw/0 1 6/;
-        $checker_bin = '/usr/sbin/sysv-rc-conf';
+        if (($distro =~ /^ubuntu/) && ($version <= 16)) {
+            $checker_bin = '/usr/sbin/sysv-rc-conf';
+        } else {
+            $uses_systemctl{'ntp'} = 1;
+            $uses_systemctl{'mysql'} = 1;
+            $uses_systemctl{'apache'} = 1;
+            $uses_systemctl{'memcached'} = 1;
+            $uses_systemctl{'cups'} = 1;
+        }
         $daemon{'mysql'}  = 'mysql';
         $daemon{'apache'} = 'apache2';
         $daemon{'ntp'}    = 'ntp';
@@ -577,7 +590,7 @@ sub chkconfig {
             $uses_systemctl{'memcached'} = 1;
             $uses_systemctl{'cups'} = 1;
         }
-        if ($version >= 22) {
+        if ($version >= 19) {
             $daemon{'mysql'} = 'mariadb';
         }
     } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
@@ -1786,14 +1799,28 @@ CREATE TABLE IF NOT EXISTS metadata (tit
 
 sub setup_mysql_permissions {
     my ($dbh,$has_pass,@mysql_lc_commands) = @_;
-    my ($mysqlversion,$mysqlsubver) = &get_mysql_version();
-    my ($usesauth,@mysql_commands);
-    if (($mysqlversion > 5.7) || (($mysqlversion == 5.7) && ($mysqlsubver > 5))) {
-        @mysql_commands = ("INSERT user (Host, User, ssl_cipher, x509_issuer, x509_subject) VALUES('localhost','www','','','')",
-                           "ALTER USER 'www'\@'localhost' IDENTIFIED BY 'localhostkey'");
-        $usesauth = 1;
+    my ($mysqlversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
+    my ($usesauth,$hasauthcol,@mysql_commands);
+    if ($mysqlname =~ /^MariaDB/i) {
+        if ($mysqlversion >= 10.2) {
+            $usesauth = 1;
+        } elsif ($mysqlversion >= 5.5) {
+            $hasauthcol = 1;
+        }
+    } else {
+        if (($mysqlversion > 5.7) || (($mysqlversion == 5.7) && ($mysqlsubver > 5))) {
+            $usesauth = 1;
+        } elsif (($mysqlversion >= 5.6) || (($mysqlversion == 5.5) && ($mysqlsubver >= 7))) {
+            $hasauthcol = 1;
+        }
+    }
+    if ($usesauth) {
+        @mysql_commands = ("INSERT user (Host, User, ssl_cipher, x509_issuer, x509_subject, authentication_string) VALUES('localhost','www','','','','')",
+                         "ALTER USER 'www'\@'localhost' IDENTIFIED BY 'localhostkey'");
+    } elsif ($hasauthcol) {
+        @mysql_commands = ("INSERT user (Host, User, Password, ssl_cipher, x509_issuer, x509_subject, authentication_string) VALUES('localhost','www',password('localhostkey'),'','','','');");
     } else {
-        @mysql_commands = ("INSERT user (Host, User, Password) VALUES('localhost','www',password('localhostkey'));");
+        @mysql_commands = ("INSERT user (Host, User, Password, ssl_cipher, x509_issuer, x509_subject) VALUES('localhost','www',password('localhostkey'),'','','');");
     }
     if ($mysqlversion < 4) {
         push (@mysql_commands,"
@@ -1886,17 +1913,17 @@ sub new_mysql_rootpasswd {
 }
 
 sub get_mysql_version {
-    my ($version,$subversion);
+    my ($version,$subversion,$name);
     if (open(PIPE," mysql -V |")) {
         my $info = <PIPE>;
         chomp($info);
         close(PIPE);
-        ($version,$subversion) = ($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,$subversion);
+    return ($version,$subversion,$name);
 }
 
 ###########################################################