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>2019-01-30 09:02:07 +0000
commitcd18e6c9f109421307adc4b0f0036d068b0d44a0 (patch)
treef9a690f91870d23e9d9857716a002de69caeb8cd
parentae30ec48059013dede060a3c2a4a1f53fcdfd387 (diff)
downloadgnu-guix-cd18e6c9f109421307adc4b0f0036d068b0d44a0.tar
gnu-guix-cd18e6c9f109421307adc4b0f0036d068b0d44a0.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 10c7f7e671..ab63019f77 100644
--- a/gnu/services/databases.scm
+++ b/gnu/services/databases.scm
@@ -556,7 +556,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
"))))
@@ -573,7 +573,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)
@@ -624,8 +624,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