Author: sandervanderburg
Date: Wed Jan 18 15:21:11 2012
New Revision: 31632
URL: https://nixos.org/websvn/nix/?rev=31632&sc=1
Log:
Only use mysqladmin authentication if we have supplied a root password
Modified:
nixos/trunk/modules/services/databases/mysql.nix
Modified: nixos/trunk/modules/services/databases/mysql.nix
==============================================================================
--- nixos/trunk/modules/services/databases/mysql.nix Wed Jan 18 15:14:42
2012 (r31631)
+++ nixos/trunk/modules/services/databases/mysql.nix Wed Jan 18 15:21:11
2012 (r31632)
@@ -215,7 +215,7 @@
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.
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
