diff options
| author | Marius Bakke <marius@gnu.org> | 2020-11-28 16:31:41 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-11-28 19:51:40 +0100 |
| commit | 927bf98e0e35cbd6d3c8416742f695def8faf90b (patch) | |
| tree | 0011f1247f6640239db3f6bd8eaf430593bd7aab /gnu | |
| parent | 27d7cdbf87e7a4520f93ee3914139215abf94e68 (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.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index 8fd87a563d0..5a88b70d748 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm | |||
| @@ -467,6 +467,7 @@ storage: | |||
| 467 | (mysql mysql-configuration-mysql (default mariadb)) | 467 | (mysql mysql-configuration-mysql (default mariadb)) |
| 468 | (bind-address mysql-configuration-bind-address (default "127.0.0.1")) | 468 | (bind-address mysql-configuration-bind-address (default "127.0.0.1")) |
| 469 | (port mysql-configuration-port (default 3306)) | 469 | (port mysql-configuration-port (default 3306)) |
| 470 | (socket mysql-configuration-socket (default "/run/mysqld/mysqld.sock")) | ||
| 470 | (extra-content mysql-configuration-extra-content (default ""))) | 471 | (extra-content mysql-configuration-extra-content (default ""))) |
| 471 | 472 | ||
| 472 | (define %mysql-accounts | 473 | (define %mysql-accounts |
| @@ -482,10 +483,10 @@ storage: | |||
| 482 | 483 | ||
| 483 | (define mysql-configuration-file | 484 | (define mysql-configuration-file |
| 484 | (match-lambda | 485 | (match-lambda |
| 485 | (($ <mysql-configuration> mysql bind-address port extra-content) | 486 | (($ <mysql-configuration> mysql bind-address port socket extra-content) |
| 486 | (mixed-text-file "my.cnf" "[mysqld] | 487 | (mixed-text-file "my.cnf" "[mysqld] |
| 487 | datadir=/var/lib/mysql | 488 | datadir=/var/lib/mysql |
| 488 | socket=/run/mysqld/mysqld.sock | 489 | socket=" socket " |
| 489 | bind-address=" bind-address " | 490 | bind-address=" bind-address " |
| 490 | port=" (number->string port) " | 491 | port=" (number->string port) " |
| 491 | " extra-content " | 492 | " extra-content " |
