[BACK]Return to install.pl CVS log [TXT] [DIR] Up to [LON-CAPA] / doc / install / linux

Diff for /doc/install/linux/install.pl between versions 1.35 and 1.41

version 1.35, 2015/01/02 13:34:08 version 1.41, 2017/03/29 22:52:04
Line 454  sub check_mysql_running { Line 454  sub check_mysql_running {
             $proc_owner = 'mysql';              $proc_owner = 'mysql';
             $use_systemctl = 1;              $use_systemctl = 1;
         }          }
           if ($1 >= 19) {
               $mysqldaemon ='mariadb';
           }
     } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {      } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
         if ($1 >= 7) {          if ($1 >= 7) {
             $mysqldaemon ='mariadb';              $mysqldaemon ='mariadb';
Line 574  sub chkconfig { Line 577  sub chkconfig {
             $uses_systemctl{'memcached'} = 1;              $uses_systemctl{'memcached'} = 1;
             $uses_systemctl{'cups'} = 1;              $uses_systemctl{'cups'} = 1;
         }          }
           if ($version >= 19) {
               $daemon{'mysql'} = 'mariadb';
           }
     } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {      } elsif ($distro =~ /^(?:centos|rhes|scientific)(\d+)/) {
         my $version = $1;          my $version = $1;
         if ($version >= 7) {          if ($version >= 7) {
Line 1780  CREATE TABLE IF NOT EXISTS metadata (tit Line 1786  CREATE TABLE IF NOT EXISTS metadata (tit
   
 sub setup_mysql_permissions {  sub setup_mysql_permissions {
     my ($dbh,$has_pass,@mysql_lc_commands) = @_;      my ($dbh,$has_pass,@mysql_lc_commands) = @_;
     my $mysqlversion = &get_mysql_version();      my ($mysqlversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
     my @mysql_commands = ("INSERT user (Host, User, Password) VALUES('localhost','www',password('localhostkey'));");      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) {      if ($mysqlversion < 4) {
         push (@mysql_commands,"          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')");  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')");
Line 1862  INSERT db (Host,Db,User,Select_priv,Inse Line 1883  INSERT db (Host,Db,User,Select_priv,Inse
 }  }
   
 sub new_mysql_rootpasswd {  sub new_mysql_rootpasswd {
     my ($currmysqlpass) = @_;      my ($currmysqlpass,$usesauth) = @_;
     return ("SET PASSWORD FOR 'root'\@'localhost'=PASSWORD('$currmysqlpass')",      if ($usesauth) {
             "FLUSH PRIVILEGES;");          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 {  sub get_mysql_version {
     my $version;      my ($version,$subversion,$name);
     if (open(PIPE," mysql -V |")) {      if (open(PIPE," mysql -V |")) {
         my $info = <PIPE>;          my $info = <PIPE>;
         chomp($info);          chomp($info);
         close(PIPE);          close(PIPE);
         ($version) = ($info =~ /(\d+\.\d+)\.\d+[\-\w]*,/);          ($version,$subversion,$name) = ($info =~ /(\d+\.\d+)\.(\d+)\-?(\w*),/);
     } else {      } else {
         print &mt('Could not determine which version of MySQL is installed.').          print &mt('Could not determine which version of MySQL is installed.').
               "\n";                "\n";
     }      }
     return $version;      return ($version,$subversion,$name);
 }  }
   
 ###########################################################  ###########################################################
Removed from v.1.35  
changed lines
  Added in v.1.41

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>