diff options
author | Orivej Desh (NixOS) <40807862+orivej-nixos@users.noreply.github.com> | 2020-03-23 16:37:58 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-23 16:37:58 +0000 |
commit | aa049c802b74b194047e617f1238ea703c82ce6a (patch) | |
tree | d82953940c4806fca8c860c472dfa5867805be57 /nixos/modules | |
parent | af615af266408c288df4c199036bfe94383bfba6 (diff) | |
parent | 6c47902e01ae1dab9967966b9a24536861436c6a (diff) | |
download | nixlib-aa049c802b74b194047e617f1238ea703c82ce6a.tar nixlib-aa049c802b74b194047e617f1238ea703c82ce6a.tar.gz nixlib-aa049c802b74b194047e617f1238ea703c82ce6a.tar.bz2 nixlib-aa049c802b74b194047e617f1238ea703c82ce6a.tar.lz nixlib-aa049c802b74b194047e617f1238ea703c82ce6a.tar.xz nixlib-aa049c802b74b194047e617f1238ea703c82ce6a.tar.zst nixlib-aa049c802b74b194047e617f1238ea703c82ce6a.zip |
Merge pull request #83042 from aanderse/mysql-fixup
nixos/mysql: fix service so it works with mysql80 package
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/databases/mysql.nix | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 248bf0ebc915..f9e657f57742 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -10,16 +10,8 @@ let isMariaDB = lib.getName mysql == lib.getName pkgs.mariadb; - isMysqlAtLeast57 = - (lib.getName mysql == lib.getName pkgs.mysql57) - && (builtins.compareVersions mysql.version "5.7" >= 0); - mysqldOptions = "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${mysql}"; - # For MySQL 5.7+, --insecure creates the root user without password - # (earlier versions and MariaDB do this by default). - installOptions = - "${mysqldOptions} ${lib.optionalString isMysqlAtLeast57 "--insecure"}"; settingsFile = pkgs.writeText "my.cnf" ( generators.toINI { listsAsDuplicateKeys = true; } cfg.settings + @@ -366,9 +358,14 @@ in pkgs.nettools ]; - preStart = '' + preStart = if isMariaDB then '' + if ! test -e ${cfg.dataDir}/mysql; then + ${mysql}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${mysqldOptions} + touch /tmp/mysql_init + fi + '' else '' if ! test -e ${cfg.dataDir}/mysql; then - ${mysql}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${installOptions} + ${mysql}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} --initialize-insecure touch /tmp/mysql_init fi ''; |