summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-11-27 13:56:38 +0100
committerMarius Bakke <marius@gnu.org>2020-11-28 19:51:40 +0100
commit89b704a456ef1cdef855a6c483832a05e1117f24 (patch)
tree9adb3ad993a05c4283edb7af9c8a4c8c43f958db
parentf4d139d02f0b0404540b74f3249de050b519b880 (diff)
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.
-rw-r--r--doc/guix.texi18
-rw-r--r--gnu/services/databases.scm8
-rw-r--r--gnu/tests/databases.scm2
3 files changed, 13 insertions, 15 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index b0126b961d..f0c95f586c 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -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
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index d7b4594b9e..bb0a0c28f2 100644
--- a/gnu/services/databases.scm
+++ b/gnu/services/databases.scm
@@ -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))
diff --git a/gnu/tests/databases.scm b/gnu/tests/databases.scm
index d3045cc3f7..1d7f53ec3e 100644
--- a/gnu/tests/databases.scm
+++ b/gnu/tests/databases.scm
@@ -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."