nixos/mysql: fix service so it works with mysql80 package [20.03 backport] #83254
Conversation
|
@GrahamcOfBorg test mysql |
ofborg
bot
added
6.topic: nixos
|
ping @NixOS/nixos-release-managers - currently |
| 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 |
There was a problem hiding this comment.
this is slightly duplicated, why not do
preStart =
let
initCommand = if isMariaDB then ''
${mysql}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${mysqldOptions}
'' else "${mysql}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} --initialize-insecure";
in ''
if ! test -e ${cfg.dataDir/mysql; then
${initCommand}
touch /tmp/mysql_init
fi
'';
There was a problem hiding this comment.
As time goes by mariadb and mysql drift further apart so I figured in this case maybe just keep it separate in case there is more divergence... but yeah maybe it was a bit much and a bit premature.
There was a problem hiding this comment.
As time goes by mariadb and mysql drift further apart so I figured in this case maybe just keep it separate in case there is more divergence...
That is a good point, this is probably fine if the actual conditional changes.
|
Lol, this is a cherry-pick. Didn't realize this right away (probably should read closer). |
Motivation for this change
I found out that the
mysql80package is broken with themysqlmodule 😱 I think this deserves a20.03backport.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)