me
/
guix
Archived
1
0
Fork 0

services: MySQL: Deprecate 'mysql-service'.

* gnu/services/databases.scm (mysql-service): Define in terms of DEFINE-DEPRECATED.
* gnu/tests/databases.scm (%mysql-os): Adjust accordingly.
* doc/guix.texi (Database Services): Adjust the MariaDB/MySQL section to
document MYSQL-SERVICE-TYPE instead of MYSQL-SERVICE.  While at it, document
the EXTRA-CONTENT field.
master
Marius Bakke 2020-11-27 13:56:38 +01:00
parent f4d139d02f
commit 89b704a456
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
3 changed files with 13 additions and 15 deletions

View File

@ -19121,16 +19121,14 @@ is the key, and the remaining elements are the values.
@subsubheading MariaDB/MySQL
@deffn {Scheme Procedure} mysql-service [#:config (mysql-configuration)]
Return a service that runs @command{mysqld}, the MySQL or MariaDB
database server.
The optional @var{config} argument specifies the configuration for
@command{mysqld}, which should be a @code{<mysql-configuration>} object.
@end deffn
@defvr {Scheme Variable} mysql-service-type
This is the service type for a MySQL or MariaDB database server. Its value
is a @code{mysql-configuration} object that specifies which package to use,
as well as various settings for the @command{mysqld} daemon.
@end defvr
@deftp {Data Type} mysql-configuration
Data type representing the configuration of @var{mysql-service}.
Data type representing the configuration of @var{mysql-service-type}.
@table @asis
@item @code{mysql} (default: @var{mariadb})
@ -19142,6 +19140,10 @@ For MariaDB, the root password is empty.
@item @code{port} (default: @code{3306})
TCP port on which the database server listens for incoming connections.
@item @code{extra-content} (default: @code{""})
Additional settings for the @file{my.cnf} configuration file.
@end table
@end deftp

View File

@ -568,12 +568,8 @@ FLUSH PRIVILEGES;
mysql-shepherd-service)))
(default-value (mysql-configuration))))
(define* (mysql-service #:key (config (mysql-configuration)))
"Return a service that runs @command{mysqld}, the MySQL or MariaDB
database server.
The optional @var{config} argument specifies the configuration for
@command{mysqld}, which should be a @code{<mysql-configuration>} object."
(define-deprecated (mysql-service #:key (config (mysql-configuration)))
mysql-service-type
(service mysql-service-type config))

View File

@ -271,7 +271,7 @@
(define %mysql-os
(simple-operating-system
(mysql-service)))
(service mysql-service-type)))
(define* (run-mysql-test)
"Run tests in %MYSQL-OS."