Diff for /doc/install/linux/install.pl between versions 1.50 and 1.52

version 1.50, 2019/02/19 19:03:42 version 1.52, 2019/02/19 19:22:36
Line 2386  sub setup_mysql_permissions { Line 2386  sub setup_mysql_permissions {
     if ($usesauth) {      if ($usesauth) {
         @mysql_commands = ("INSERT user (Host, User, ssl_cipher, x509_issuer, x509_subject, authentication_string) VALUES('localhost','www','','','','')");          @mysql_commands = ("INSERT user (Host, User, ssl_cipher, x509_issuer, x509_subject, authentication_string) VALUES('localhost','www','','','','')");
         if ($is_mariadb) {          if ($is_mariadb) {
              push(@mysql_commands,"ALTER USER 'www'\@'localhost' IDENTIFIED BY 'localhostkey'");              push(@mysql_commands,"ALTER USER 'www'\@'localhost' IDENTIFIED BY 'localhostkey'");
         } else {          } else {
              push(@mysql_commands,"ALTER USER 'www'\@'localhost' IDENTIFIED WITH mysql_native_password BY 'localhostkey'");              push(@mysql_commands,"ALTER USER 'www'\@'localhost' IDENTIFIED WITH mysql_native_password BY 'localhostkey'");
         }          }
     } elsif ($hasauthcol) {      } elsif ($hasauthcol) {
         @mysql_commands = ("INSERT user (Host, User, Password, ssl_cipher, x509_issuer, x509_subject, authentication_string) VALUES('localhost','www',password('localhostkey'),'','','','');");          @mysql_commands = ("INSERT user (Host, User, Password, ssl_cipher, x509_issuer, x509_subject, authentication_string) VALUES('localhost','www',password('localhostkey'),'','','','');");
Line 2477  sub new_mysql_rootpasswd { Line 2477  sub new_mysql_rootpasswd {
     my ($currmysqlpass,$usesauth,$is_mariadb) = @_;      my ($currmysqlpass,$usesauth,$is_mariadb) = @_;
     if ($usesauth) {      if ($usesauth) {
         if ($is_mariadb) {          if ($is_mariadb) {
             return ("ALTER USER 'root'\@'localhost' IDENTIFIED WITH mysql_native_password BY '$currmysqlpass'",              return ("ALTER USER 'root'\@'localhost' IDENTIFIED BY '$currmysqlpass'",
                     "FLUSH PRIVILEGES;");                      "FLUSH PRIVILEGES;");
         } else {          } else {
             return ("ALTER USER 'root'\@'localhost' IDENTIFIED BY '$currmysqlpass'",              return ("ALTER USER 'root'\@'localhost' IDENTIFIED WITH mysql_native_password BY '$currmysqlpass'",
                     "FLUSH PRIVILEGES;");                      "FLUSH PRIVILEGES;");
         }          }
     } else {      } else {

Removed from v.1.50  
changed lines
  Added in v.1.52


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