aboutsummaryrefslogtreecommitdiff
path: root/gnu/services
diff options
context:
space:
mode:
authorLeo Prikler <leo.prikler@student.tugraz.at>2021-04-14 00:59:52 +0200
committerLeo Prikler <leo.prikler@student.tugraz.at>2021-04-14 00:59:52 +0200
commit4dff6ecde85eec473ab231cf75f51e98e8aca1e9 (patch)
tree47c7229d68c297d2781db1c375143bf6cec9542f /gnu/services
parentc2e83b71054f953953711e027f863d6c75c6ddb2 (diff)
downloadguix-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.
Diffstat (limited to 'gnu/services')
-rw-r--r--gnu/services/databases.scm7
1 files changed, 1 insertions, 6 deletions
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)