diff options
| author | Pavel Goran <me@pvgoran.name> | 2018-11-18 12:25:18 +0700 |
|---|---|---|
| committer | Pavel Goran <me@pvgoran.name> | 2018-11-18 12:25:36 +0700 |
| commit | 21e9c35f5f0b3bb48bafe44f69ae6e14670c1633 (patch) | |
| tree | e95b30fec011f294f92dd5c754976bec0adc5a27 /nixos/modules/services/databases/mysql.nix | |
| parent | 3fc7d5eb83804e10ae55b1ae9b102f88b1ea2b08 (diff) | |
| download | nixpkgs-21e9c35f5f0b3bb48bafe44f69ae6e14670c1633.tar nixpkgs-21e9c35f5f0b3bb48bafe44f69ae6e14670c1633.tar.gz nixpkgs-21e9c35f5f0b3bb48bafe44f69ae6e14670c1633.tar.bz2 nixpkgs-21e9c35f5f0b3bb48bafe44f69ae6e14670c1633.tar.lz nixpkgs-21e9c35f5f0b3bb48bafe44f69ae6e14670c1633.tar.xz nixpkgs-21e9c35f5f0b3bb48bafe44f69ae6e14670c1633.tar.zst nixpkgs-21e9c35f5f0b3bb48bafe44f69ae6e14670c1633.zip | |
nixos/mysql: support package=mysql57
Diffstat (limited to 'nixos/modules/services/databases/mysql.nix')
| -rw-r--r-- | nixos/modules/services/databases/mysql.nix | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 0dde9ee6e2e..612849bc2c5 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -12,12 +12,22 @@ let let pName = _p: (builtins.parseDrvName (_p.name)).name; in pName mysql == pName pkgs.mariadb; + isMysqlAtLeast57 = + let + pName = _p: (builtins.parseDrvName (_p.name)).name; + in (pName mysql == pName pkgs.mysql57) + && ((builtins.compareVersions mysql.version "5.7") >= 0); pidFile = "${cfg.pidDir}/mysqld.pid"; + mysqldAndInstallOptions = + "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${mysql}"; mysqldOptions = - "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${mysql} " + - "--pid-file=${pidFile}"; + "${mysqldAndInstallOptions} --pid-file=${pidFile}"; + # For MySQL 5.7+, --insecure creates the root user without password + # (earlier versions and MariaDB do this by default). + installOptions = + "${mysqldAndInstallOptions} ${lib.optionalString isMysqlAtLeast57 "--insecure"}"; myCnf = pkgs.writeText "my.cnf" '' @@ -252,7 +262,7 @@ in if ! test -e ${cfg.dataDir}/mysql; then mkdir -m 0700 -p ${cfg.dataDir} chown -R ${cfg.user} ${cfg.dataDir} - ${mysql}/bin/mysql_install_db ${mysqldOptions} + ${mysql}/bin/mysql_install_db ${installOptions} touch /tmp/mysql_init fi |