summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2018-05-20 17:22:28 +0100
committerChristopher Baines <christopher.baines@digital.cabinet-office.gov.uk>2018-05-20 17:25:16 +0100
commit7a037e449ecf90e5d4d112456e8143f89eab25e1 (patch)
tree6e05548ca2cea060bc6bd4a050c876aa641fd82d
parentbdad746b51e88c65de21d7be793ad90d1ddecff5 (diff)
downloadgnu-guix-7a037e449ecf90e5d4d112456e8143f89eab25e1.tar
gnu-guix-7a037e449ecf90e5d4d112456e8143f89eab25e1.tar.gz
Use a pid file in the mysql service
-rw-r--r--gnu/services/databases.scm11
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index b91d9ccc56..18a92f2bc6 100644
--- a/gnu/services/databases.scm
+++ b/gnu/services/databases.scm
@@ -549,7 +549,7 @@ storage:
(($ <mysql-configuration> mysql port)
(mixed-text-file "my.cnf" "[mysqld]
datadir=/var/lib/mysql
-socket=/run/mysqld/mysqld.sock
+socket=/var/run/mysql/mysqld.sock
port=" (number->string port) "
max_allowed_packet=16M
"))))
@@ -566,7 +566,7 @@ max_allowed_packet=16M
(uid (passwd:uid user))
(gid (passwd:gid user))
(datadir "/var/lib/mysql")
- (rundir "/run/mysqld"))
+ (rundir "/var/run/mysql"))
(mkdir-p datadir)
(chown datadir uid gid)
(mkdir-p rundir)
@@ -617,8 +617,11 @@ FLUSH PRIVILEGES;
(my.cnf (mysql-configuration-file config)))
#~(make-forkexec-constructor
(list (string-append #$mysql "/bin/mysqld")
- (string-append "--defaults-file=" #$my.cnf))
- #:user "mysql" #:group "mysql")))
+ (string-append "--defaults-file=" #$my.cnf)
+ "--pid-file=/var/run/mysql/pid")
+ #:user "mysql"
+ #:group "mysql"
+ #:pid-file "/var/run/mysql/pid")))
(stop #~(make-kill-destructor)))))
(define mysql-service-type