diff options
| author | methuselah-0 <david.larsson@selfhosted.xyz> | 2021-04-11 10:30:01 +0200 |
|---|---|---|
| committer | Leo Prikler <leo.prikler@student.tugraz.at> | 2021-04-13 18:47:32 +0200 |
| commit | f3626119d738f30b5ab59e76c105fd7b4c077ddc (patch) | |
| tree | d159deb69e885783da58d583ff989467210dff36 | |
| parent | b5607d830c917c49ca9a7993962bd2b7c7be953c (diff) | |
| download | guix-f3626119d738f30b5ab59e76c105fd7b4c077ddc.tar guix-f3626119d738f30b5ab59e76c105fd7b4c077ddc.tar.gz | |
services: mysql: Add extra-environment as configuration option.
* gnu/services/databases.scm (mysql-configuration): Add extra-environment
(mysql-service): Use #:log-file and #:environment-variables
* doc/guix.texi: Document it.
Signed-off-by: Leo Prikler <leo.prikler@student.tugraz.at>
| -rw-r--r-- | doc/guix.texi | 3 | ||||
| -rw-r--r-- | gnu/services/databases.scm | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 1069a5d296..fa14b35e2a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19947,6 +19947,9 @@ Socket file to use for local (non-network) connections. @item @code{extra-content} (default: @code{""}) Additional settings for the @file{my.cnf} configuration file. +@item @code{extra-environment} (default: @code{#~'()}) +List of environment variables passed to the @command{mysqld} process. + @item @code{auto-upgrade?} (default: @code{#t}) Whether to automatically run @command{mysql_upgrade} after starting the service. This is necessary to upgrade the @dfn{system schema} after diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index 6ef3f3383c..956993de7a 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org> +;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -527,6 +528,7 @@ created after the PostgreSQL database is started."))) (port mysql-configuration-port (default 3306)) (socket mysql-configuration-socket (default "/run/mysqld/mysqld.sock")) (extra-content mysql-configuration-extra-content (default "")) + (extra-environment mysql-configuration-extra-environment (default #~'())) (auto-upgrade? mysql-configuration-auto-upgrade? (default #t))) (define %mysql-accounts @@ -611,11 +613,14 @@ FLUSH PRIVILEGES; (provision '(mysql)) (documentation "Run the MySQL server.") (start (let ((mysql (mysql-configuration-mysql config)) + (extra-env (mysql-configuration-extra-environment config)) (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"))) + #:user "mysql" #:group "mysql" + #:log-file "/var/log/mysqld.log" + #:environment-variables #$extra-env))) (stop #~(make-kill-destructor))))) (define (mysql-upgrade-wrapper mysql socket-file) |