diff options
author | Andreas Enge <andreas@enge.fr> | 2023-04-22 09:21:22 +0200 |
---|---|---|
committer | Andreas Enge <andreas@enge.fr> | 2023-04-22 09:21:22 +0200 |
commit | d1252b597d8b6c77746da7b7417d958f00d01dc6 (patch) | |
tree | e2cdc9b0938e5ed7ac1b095b83c5760bbedecb87 /gnu/services/databases.scm | |
parent | 3f7ae420d8a54d4e2ab7f349c40d8930fe9e0771 (diff) | |
parent | 040d35f088e0f1c856f3f5a9b6bf889b17bd68b3 (diff) |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/services/databases.scm')
-rw-r--r-- | gnu/services/databases.scm | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index b7bd1e587e..e8e42d3b7b 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson <davet@gnu.org> -;;; Copyright © 2015, 2016, 2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015-2016, 2022-2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> @@ -167,7 +167,8 @@ host all all ::1/128 md5")) (define-record-type* <postgresql-configuration> postgresql-configuration make-postgresql-configuration postgresql-configuration? - (postgresql postgresql-configuration-postgresql) ;file-like + (postgresql postgresql-configuration-postgresql ;file-like + (default postgresql-10)) (port postgresql-configuration-port (default 5432)) (locale postgresql-configuration-locale @@ -308,11 +309,12 @@ host all all ::1/128 md5")) (call-with-input-file #$pid-file read)) (_ #t)))))) (list (shepherd-service - (provision '(postgres)) + (provision '(postgres postgresql)) (documentation "Run the PostgreSQL daemon.") (requirement '(user-processes loopback syslogd)) (modules `((ice-9 match) ,@%default-modules)) + (actions (list (shepherd-configuration-action config-file))) (start (action "start")) (stop (action "stop")))))))) @@ -329,8 +331,7 @@ host all all ::1/128 md5")) (service-extension profile-service-type (compose list postgresql-configuration-postgresql)))) - (default-value (postgresql-configuration - (postgresql postgresql-10))) + (default-value (postgresql-configuration)) (description "Run the PostgreSQL database server."))) (define-deprecated (postgresql-service #:key (postgresql postgresql) @@ -595,6 +596,8 @@ port=" (number->string port) " (provision '(mysql)) (requirement '(user-processes)) (documentation "Run the MySQL server.") + (actions (list (shepherd-configuration-action + (mysql-configuration-file config)))) (start (let ((mysql (mysql-configuration-mysql config)) (extra-env (mysql-configuration-extra-environment config)) (my.cnf (mysql-configuration-file config))) @@ -752,6 +755,7 @@ port=" (number->string port) " (provision '(redis)) (documentation "Run the Redis daemon.") (requirement '(user-processes syslogd)) + (actions (list (shepherd-configuration-action config-file))) (start #~(make-forkexec-constructor '(#$(file-append redis "/bin/redis-server") #$config-file) |