ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-23 19:19:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "services: mysql: Add extra-environment as configuration option."

Browse source 
This reverts commit f3626119d7.
This commit inadvertently broke a string freeze.  Let's be nice to our
translators and not do that.
This commit is contained in:
Leo Prikler 2021-04-14 00:59:52 +02:00
parent c2e83b7105
commit 4dff6ecde8
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/guix.texi
View file

@ -19947,9 +19947,6 @@ Socket file to use for local (non-network) connections.
@item @code{extra-content} (default: @code{""}) @item @code{extra-content} (default: @code{""})
Additional settings for the @file{my.cnf} configuration file. 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}) @item @code{auto-upgrade?} (default: @code{#t})
Whether to automatically run @command{mysql_upgrade} after starting the Whether to automatically run @command{mysql_upgrade} after starting the
service. This is necessary to upgrade the @dfn{system schema} after service. This is necessary to upgrade the @dfn{system schema} after

7
gnu/services/databases.scm
View file

@ -7,7 +7,6 @@
;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net> ;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -528,7 +527,6 @@ (define-record-type* <mysql-configuration>
(port mysql-configuration-port (default 3306)) (port mysql-configuration-port (default 3306))
(socket mysql-configuration-socket (default "/run/mysqld/mysqld.sock")) (socket mysql-configuration-socket (default "/run/mysqld/mysqld.sock"))
(extra-content mysql-configuration-extra-content (default "")) (extra-content mysql-configuration-extra-content (default ""))
(extra-environment mysql-configuration-extra-environment (default #~'()))
(auto-upgrade? mysql-configuration-auto-upgrade? (default #t))) (auto-upgrade? mysql-configuration-auto-upgrade? (default #t)))
(define %mysql-accounts (define %mysql-accounts
@ -613,14 +611,11 @@ (define (mysql-shepherd-service config)
(provision '(mysql)) (provision '(mysql))
(documentation "Run the MySQL server.") (documentation "Run the MySQL server.")
(start (let ((mysql (mysql-configuration-mysql config)) (start (let ((mysql (mysql-configuration-mysql config))
(extra-env (mysql-configuration-extra-environment config))
(my.cnf (mysql-configuration-file config))) (my.cnf (mysql-configuration-file config)))
#~(make-forkexec-constructor #~(make-forkexec-constructor
(list (string-append #$mysql "/bin/mysqld") (list (string-append #$mysql "/bin/mysqld")
(string-append "--defaults-file=" #$my.cnf)) (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))))) (stop #~(make-kill-destructor)))))
(define (mysql-upgrade-wrapper mysql socket-file) (define (mysql-upgrade-wrapper mysql socket-file)