nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 03:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

mysql: Port to systemd

Browse Source
This commit is contained in:
Eelco Dolstra 2012-12-18 13:40:04 +01:00
parent 251f8546c9
commit 75c67b0194
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/services/databases/mysql.nix
View File

@ -91,6 +91,7 @@ in
description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database"; description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database";
}; };
# FIXME: remove this option; it's a really bad idea.
rootPassword = mkOption { rootPassword = mkOption {
default = null; default = null;
description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty."; description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty.";
@ -140,10 +141,12 @@ in
environment.systemPackages = [mysql]; environment.systemPackages = [mysql];
jobs.mysql = boot.systemd.services.mysql =
{ description = "MySQL server"; { description = "MySQL Server";
startOn = "filesystem"; wantedBy = [ "multi-user.target" ];
unitConfig.RequiresMountsFor = "${cfg.dataDir}";
preStart = preStart =
'' ''
@ -156,9 +159,12 @@ in
mkdir -m 0700 -p ${cfg.pidDir} mkdir -m 0700 -p ${cfg.pidDir}
chown -R ${cfg.user} ${cfg.pidDir} chown -R ${cfg.user} ${cfg.pidDir}
'';
${mysql}/libexec/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions} &
serviceConfig.ExecStart = "${mysql}/libexec/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}";
postStart =
''
# Wait until the MySQL server is available for use # Wait until the MySQL server is available for use
count=0 count=0
while [ ! -e /tmp/mysql.sock ] while [ ! -e /tmp/mysql.sock ]
@ -183,7 +189,7 @@ in
echo "Creating initial database: ${database.name}" echo "Creating initial database: ${database.name}"
( echo "create database ${database.name};" ( echo "create database ${database.name};"
echo "use ${database.name};" echo "use ${database.name};"
if [ -f "${database.schema}" ] if [ -f "${database.schema}" ]
then then
cat ${database.schema} cat ${database.schema}
@ -204,7 +210,7 @@ in
${optionalString (cfg.rootPassword != null) ${optionalString (cfg.rootPassword != null)
'' ''
# Change root password # Change root password
( echo "use mysql;" ( echo "use mysql;"
echo "update user set Password=password('$(cat ${cfg.rootPassword})') where User='root';" echo "update user set Password=password('$(cat ${cfg.rootPassword})') where User='root';"
echo "flush privileges;" echo "flush privileges;"
@ -213,14 +219,10 @@ in
rm /tmp/mysql_init rm /tmp/mysql_init
fi fi
''; ''; # */
postStop = "${mysql}/bin/mysqladmin ${optionalString (cfg.rootPassword != null) "--user=root --password=\"$(cat ${cfg.rootPassword})\""} shutdown"; serviceConfig.ExecStop =
"${mysql}/bin/mysqladmin ${optionalString (cfg.rootPassword != null) "--user=root --password=\"$(cat ${cfg.rootPassword})\""} shutdown";
# !!! Need a postStart script to wait until mysqld is ready to
# accept connections.
extraConfig = "kill timeout 60";
}; };
}; };

4
modules/services/databases/postgresql.nix
View File

@ -156,10 +156,10 @@ in
environment.systemPackages = [postgresql]; environment.systemPackages = [postgresql];
boot.systemd.services.postgresql = boot.systemd.services.postgresql =
{ description = "PostgreSQL"; { description = "PostgreSQL Server";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" "fs.target" ]; after = [ "network.target" ];
environment = environment =
{ TZ = config.time.timeZone; { TZ = config.time.timeZone;