Modified variable names to follow the standard convention
svn path=/nixos/trunk/; revision=10544
This commit is contained in:
parent
7fad8dc1b9
commit
390d2adb91
@ -1660,17 +1660,17 @@
|
|||||||
description = "User account under which MySQL runs";
|
description = "User account under which MySQL runs";
|
||||||
};
|
};
|
||||||
|
|
||||||
datadir = mkOption {
|
dataDir = mkOption {
|
||||||
default = "/var/mysql";
|
default = "/var/mysql";
|
||||||
description = "Location where MySQL stores its table files";
|
description = "Location where MySQL stores its table files";
|
||||||
};
|
};
|
||||||
|
|
||||||
log_error = mkOption {
|
logError = mkOption {
|
||||||
default = "/var/log/mysql_err.log";
|
default = "/var/log/mysql_err.log";
|
||||||
description = "Location of the MySQL error logfile";
|
description = "Location of the MySQL error logfile";
|
||||||
};
|
};
|
||||||
|
|
||||||
pid_file = mkOption {
|
pidFile = mkOption {
|
||||||
default = "/var/mysql/mysql.pid";
|
default = "/var/mysql/mysql.pid";
|
||||||
description = "Location of the file which stores the PID of the MySQL server";
|
description = "Location of the file which stores the PID of the MySQL server";
|
||||||
};
|
};
|
||||||
|
@ -5,8 +5,8 @@ let
|
|||||||
cfg = config.services.mysql;
|
cfg = config.services.mysql;
|
||||||
mysqlService = import ../services/mysql {
|
mysqlService = import ../services/mysql {
|
||||||
inherit (pkgs) stdenv mysql;
|
inherit (pkgs) stdenv mysql;
|
||||||
inherit (cfg) port user datadir
|
inherit (cfg) port user dataDir
|
||||||
log_error pid_file;
|
logError pidFile;
|
||||||
};
|
};
|
||||||
|
|
||||||
in
|
in
|
||||||
|
Loading…
x
Reference in New Issue
Block a user