summary refs log tree commit diff
path: root/gnu/services/databases.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/services/databases.scm')
-rw-r--r--gnu/services/databases.scm8
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index ec31489d48..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)
@@ -524,7 +526,7 @@ port=" (number->string port) "
                   (for-each
                    (lambda (sql)
                      (call-with-input-file
-                         (string-append #$mysql "/share/mysql/" sql)
+                         (string-append #$mysql:lib "/share/mysql/" sql)
                        (lambda (in) (dump-port in p))))
                    '("mysql_system_tables.sql"
                      "mysql_performance_tables.sql"