about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorIzorkin <izorkin@elven.pw>2020-05-14 20:34:14 +0300
committerIzorkin <izorkin@elven.pw>2020-06-10 12:38:42 +0300
commiteed170d9ab643424d0771b6b4fea771e138e901b (patch)
treee587a1d2213c2b4f7d1228536d505c80e1d70653 /nixos/modules
parenta9d5f088b56c80e32ae7cdaaa4391b19e82fe6fc (diff)
downloadnixlib-eed170d9ab643424d0771b6b4fea771e138e901b.tar
nixlib-eed170d9ab643424d0771b6b4fea771e138e901b.tar.gz
nixlib-eed170d9ab643424d0771b6b4fea771e138e901b.tar.bz2
nixlib-eed170d9ab643424d0771b6b4fea771e138e901b.tar.lz
nixlib-eed170d9ab643424d0771b6b4fea771e138e901b.tar.xz
nixlib-eed170d9ab643424d0771b6b4fea771e138e901b.tar.zst
nixlib-eed170d9ab643424d0771b6b4fea771e138e901b.zip
nixos/mysql: fix init databases on first start in sandbox mode
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/databases/mysql.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 1caedf1fc5fb..2e8c5b7640b2 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -358,12 +358,12 @@ in
         preStart = if isMariaDB then ''
           if ! test -e ${cfg.dataDir}/mysql; then
             ${mysql}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${mysqldOptions}
-            touch /tmp/mysql_init
+            touch ${cfg.dataDir}/mysql_init
           fi
         '' else ''
           if ! test -e ${cfg.dataDir}/mysql; then
             ${mysql}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} --initialize-insecure
-            touch /tmp/mysql_init
+            touch ${cfg.dataDir}/mysql_init
           fi
         '';
 
@@ -395,7 +395,7 @@ in
                   done
                 ''}
 
-                if [ -f /tmp/mysql_init ]
+                if [ -f ${cfg.dataDir}/mysql_init ]
                 then
                     ${concatMapStrings (database: ''
                       # Create initial databases