diff options
| author | Leo Prikler <leo.prikler@student.tugraz.at> | 2021-04-14 00:59:52 +0200 |
|---|---|---|
| committer | Leo Prikler <leo.prikler@student.tugraz.at> | 2021-04-14 00:59:52 +0200 |
| commit | 4dff6ecde85eec473ab231cf75f51e98e8aca1e9 (patch) | |
| tree | 47c7229d68c297d2781db1c375143bf6cec9542f | |
| parent | c2e83b71054f953953711e027f863d6c75c6ddb2 (diff) | |
| download | guix-4dff6ecde85eec473ab231cf75f51e98e8aca1e9.tar guix-4dff6ecde85eec473ab231cf75f51e98e8aca1e9.tar.gz | |
Revert "services: mysql: Add extra-environment as configuration option."
This reverts commit f3626119d738f30b5ab59e76c105fd7b4c077ddc.
This commit inadvertently broke a string freeze. Let's be nice to our
translators and not do that.
| -rw-r--r-- | doc/guix.texi | 3 | ||||
| -rw-r--r-- | gnu/services/databases.scm | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index fa14b35e2a..1069a5d296 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19947,9 +19947,6 @@ 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 eba88cdb68..4a6d36b50b 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -7,7 +7,6 @@ ;;; 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. ;;; @@ -528,7 +527,6 @@ 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 @@ -613,14 +611,11 @@ 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" - #:log-file "/var/log/mysqld.log" - #:environment-variables #$extra-env))) + #:user "mysql" #:group "mysql"))) (stop #~(make-kill-destructor))))) (define (mysql-upgrade-wrapper mysql socket-file) |