diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-03-29 13:29:57 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-03-29 13:30:05 -0700 |
| commit | ca149f2be05b677ccd4a1f8b502c242bc85747c6 (patch) | |
| tree | de6194e6d0d884b9f9ab6f1b4b8b56af899c0a98 /nixos | |
| parent | b09a6573a081920e9f247f963a526d64f250bfa0 (diff) | |
| download | nixlib-ca149f2be05b677ccd4a1f8b502c242bc85747c6.tar nixlib-ca149f2be05b677ccd4a1f8b502c242bc85747c6.tar.gz nixlib-ca149f2be05b677ccd4a1f8b502c242bc85747c6.tar.bz2 nixlib-ca149f2be05b677ccd4a1f8b502c242bc85747c6.tar.lz nixlib-ca149f2be05b677ccd4a1f8b502c242bc85747c6.tar.xz nixlib-ca149f2be05b677ccd4a1f8b502c242bc85747c6.tar.zst nixlib-ca149f2be05b677ccd4a1f8b502c242bc85747c6.zip | |
nixos/mysql: All versions of mysql have mysqld in /bin
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/databases/mysql.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index b94a3fbf3de7..1e2400d84b36 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -10,8 +10,6 @@ let is55 = mysql.mysqlVersion == "5.5"; - mysqldDir = if is55 then "${mysql}/bin" else "${mysql}/libexec"; - pidFile = "${cfg.pidDir}/mysqld.pid"; mysqldOptions = @@ -182,7 +180,7 @@ in chown -R ${cfg.user} ${cfg.pidDir} ''; - serviceConfig.ExecStart = "${mysqldDir}/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}"; + serviceConfig.ExecStart = "${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}"; postStart = '' |