about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorArseniy Seroka <jagajaga@users.noreply.github.com>2015-11-29 18:22:33 +0300
committerArseniy Seroka <jagajaga@users.noreply.github.com>2015-11-29 18:22:33 +0300
commita9056371a0a62da46ff88183a6535635ed085dec (patch)
tree0c04c292a14ad7e4130ced52ccb87886acbecd96 /nixos
parentffc1762715d2419d7db953bf9c73d2f6f54d9d89 (diff)
parentaf500630e86dd2c3c3c401978a808b35f32e0712 (diff)
Merge pull request #9701 from basvandijk/wordpress-fix
wordpress: use the correct mysql pidDir
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/web-servers/apache-httpd/wordpress.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
index 7a0314027a3d7..a28c8567f9ff4 100644
--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@@ -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};'