swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-10-01 17:40:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Only use mysqladmin authentication if we have supplied a root password

Browse source 
svn path=/nixos/trunk/; revision=31632
This commit is contained in:
Sander van der Burg 2012-01-18 15:21:11 +00:00
parent d4b6aa3553
commit 1e59a18f90
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/services/databases/mysql.nix
View file

@ -215,7 +215,7 @@ in
fi
'';
postStop = "${mysql}/bin/mysqladmin --user=root --password=\"$(cat ${cfg.rootPassword})\" shutdown";
postStop = "${mysql}/bin/mysqladmin ${optionalString (cfg.rootPassword != null) "--user=root --password=\"$(cat ${cfg.rootPassword})\""} shutdown";
# !!! Need a postStart script to wait until mysqld is ready to
# accept connections.