summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-11-28 16:31:41 +0100
committerMarius Bakke <marius@gnu.org>2020-11-28 19:51:40 +0100
commit927bf98e0e35cbd6d3c8416742f695def8faf90b (patch)
tree0011f1247f6640239db3f6bd8eaf430593bd7aab /gnu
parent27d7cdbf87e7a4520f93ee3914139215abf94e68 (diff)
services: MySQL: Make the socket configurable.
* gnu/services/databases.scm (<mysql-configuration>): Add SOCKET field. (mysql-configuration-file): Adjust accordingly. * doc/guix.texi (Database Services): Likewise.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/services/databases.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index 8fd87a563d..5a88b70d74 100644
--- a/gnu/services/databases.scm
+++ b/gnu/services/databases.scm
@@ -467,6 +467,7 @@ storage:
(mysql mysql-configuration-mysql (default mariadb))
(bind-address mysql-configuration-bind-address (default "127.0.0.1"))
(port mysql-configuration-port (default 3306))
+ (socket mysql-configuration-socket (default "/run/mysqld/mysqld.sock"))
(extra-content mysql-configuration-extra-content (default "")))
(define %mysql-accounts
@@ -482,10 +483,10 @@ storage:
(define mysql-configuration-file
(match-lambda
- (($ <mysql-configuration> mysql bind-address port extra-content)
+ (($ <mysql-configuration> mysql bind-address port socket extra-content)
(mixed-text-file "my.cnf" "[mysqld]
datadir=/var/lib/mysql
-socket=/run/mysqld/mysqld.sock
+socket=" socket "
bind-address=" bind-address "
port=" (number->string port) "
" extra-content "