diff options
| author | Marius Bakke <[email protected]> | 2020-01-21 22:39:42 +0100 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2020-01-21 22:39:42 +0100 |
| commit | 8ed9be3faccb865204de46d2a8ed3e96e59281b6 (patch) | |
| tree | 77ba4c90cda569048bc9ce2e414ede1567130c88 /gnu/services/databases.scm | |
| parent | 36930b2463fc933e7c5580f49413dbd14cf1df48 (diff) | |
| parent | 715110a8a2e9e4b1a89635950744eb5260b8ee7f (diff) | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/services/databases.scm')
| -rw-r--r-- | gnu/services/databases.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index a26eeb20cc..473ece4e97 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -463,7 +463,8 @@ storage: mysql-configuration make-mysql-configuration mysql-configuration? (mysql mysql-configuration-mysql (default mariadb)) - (port mysql-configuration-port (default 3306))) + (port mysql-configuration-port (default 3306)) + (extra-content mysql-configuration-extra-content (default ""))) (define %mysql-accounts (list (user-group @@ -478,11 +479,12 @@ storage: (define mysql-configuration-file (match-lambda - (($ <mysql-configuration> mysql port) + (($ <mysql-configuration> mysql port extra-content) (mixed-text-file "my.cnf" "[mysqld] datadir=/var/lib/mysql socket=/run/mysqld/mysqld.sock port=" (number->string port) " +" extra-content " ")))) (define (%mysql-activation config) |