movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-26 19:16:47 +03:00
Code Activity

Merge branch 'master' into closure-size

Browse source
This commit is contained in:
Luca Bruno 2015-11-29 16:50:26 +01:00
commit 920b1d3591
241 changed files with 13028 additions and 1473 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/web-servers/apache-httpd/wordpress.nix
View file

@ -248,7 +248,7 @@ in
if [ ! -d ${serverInfo.fullConfig.services.mysql.dataDir}/${config.dbName} ]; then
echo "Need to create the database '${config.dbName}' and grant permissions to user named '${config.dbUser}'."
# Wait until MySQL is up
while [ ! -e /var/run/mysql/mysqld.pid ]; do
while [ ! -e ${serverInfo.fullConfig.services.mysql.pidDir}/mysqld.pid ]; do
sleep 1
done
${pkgs.mysql}/bin/mysql -e 'CREATE DATABASE ${config.dbName};'