about summary refs log tree commit diff
path: root/nixos/modules/services/databases
diff options
context:
space:
mode:
authorPascal Bach <pascal.bach@nextrem.ch>2017-05-20 00:30:51 +0200
committerPascal Bach <pascal.bach@nextrem.ch>2017-05-20 15:46:13 +0200
commitf469bd83bb9390807f1cdbe2de8d56bb8a710eb5 (patch)
treea7d359503883a252b7ddd6950e7ec2be902d88ad /nixos/modules/services/databases
parent9f6b1dca58375de995e8af4ae44ae76e3dd5f0f7 (diff)
downloadnixlib-f469bd83bb9390807f1cdbe2de8d56bb8a710eb5.tar
nixlib-f469bd83bb9390807f1cdbe2de8d56bb8a710eb5.tar.gz
nixlib-f469bd83bb9390807f1cdbe2de8d56bb8a710eb5.tar.bz2
nixlib-f469bd83bb9390807f1cdbe2de8d56bb8a710eb5.tar.lz
nixlib-f469bd83bb9390807f1cdbe2de8d56bb8a710eb5.tar.xz
nixlib-f469bd83bb9390807f1cdbe2de8d56bb8a710eb5.tar.zst
nixlib-f469bd83bb9390807f1cdbe2de8d56bb8a710eb5.zip
mysql service: change default data directory for 17.09
The new directory is now moved to /var/lib/mysql. This makes it consistent with
with upstream.
Diffstat (limited to 'nixos/modules/services/databases')
-rw-r--r--nixos/modules/services/databases/mysql.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index fcf1f123cfb5..bae6b170c472 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -72,7 +72,7 @@ in
 
       dataDir = mkOption {
         type = types.path;
-        default = "/var/mysql"; # !!! should be /var/db/mysql
+        example = "/var/lib/mysql";
         description = "Location where MySQL stores its table files";
       };
 
@@ -166,6 +166,10 @@ in
 
   config = mkIf config.services.mysql.enable {
 
+    services.mysql.dataDir =
+      mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql"
+                 else "/var/mysql");
+
     users.extraUsers.mysql = {
       description = "MySQL server user";
       group = "mysql";