Commit b80c547b authored by Raj's avatar Raj Committed by 6543
Browse files

nixos/services.mysql: Set default data directory for MySQL at option default 

set the default at option definition to not overlook where the default is set.
parent d1db0089

nixos/modules/services/databases/mysql.nix

+3 −4
Original line number Diff line number Diff line
@@ -111,6 +111,9 @@ in 


      dataDir = lib.mkOption {

        type = lib.types.path;

        default = (

          if lib.versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql" else "/var/mysql"

        );

        example = "/var/lib/mysql";

        description = ''

          The data directory for MySQL.
@@ -430,10 +433,6 @@ in 
      }

    ];



    services.mysql.dataDir = lib.mkDefault (

      if lib.versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql" else "/var/mysql"

    );



    services.mysql.settings.mysqld = lib.mkMerge [

      {

        datadir = cfg.dataDir;