Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5276ce981a0e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fde29b2b06be
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 20, 2017

  1. 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.
    @bachp
    bachp committed May 20, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    ijjk JJ Kasper
    GPG key ID: 47B7C67C7B64BEE6
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f469bd8 View commit details

Commits on May 29, 2017

  1. Merge pull request #25931 from bachp/mysql-17.09 

    mysql service: change default data directory for 17.09
    @grahamc
    grahamc authored May 29, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    ijjk JJ Kasper
    GPG key ID: 47B7C67C7B64BEE6
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fde29b2 View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 nixos/modules/services/databases/mysql.nix
6 changes: 5 additions & 1 deletion nixos/modules/services/databases/mysql.nix
View file
Original file line number Diff line number Diff line change
@@ -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";