[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/2] services: postgresql: Add port to configuration
From: |
Christopher Baines |
Subject: |
[PATCH 1/2] services: postgresql: Add port to configuration |
Date: |
Wed, 14 Dec 2016 08:35:48 +0000 |
* gnu/services/databases.scm (<postgresql-configuration>): Add port
field.
(postgresql-shepherd-service): Pass port to postgres.
(postgresql-service): Add port default.
---
doc/guix.texi | 7 ++++---
gnu/services/databases.scm | 9 +++++++--
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index f1c5963f7..af5869314 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -10150,13 +10150,14 @@ Users need to be in the @code{lp} group to access the
D-Bus service.
The @code{(gnu services databases)} module provides the following services.
@deffn {Scheme Procedure} postgresql-service [#:postgresql postgresql] @
- [#:config-file] [#:data-directory ``/var/lib/postgresql/data'']
+ [#:config-file] [#:data-directory ``/var/lib/postgresql/data''] @
+ [#:port 5432]
Return a service that runs @var{postgresql}, the PostgreSQL database
server.
The PostgreSQL daemon loads its runtime configuration from
address@hidden and stores the database cluster in
address@hidden
address@hidden, stores the database cluster in @var{data-directory} and
+listens on @var{port}.
@end deffn
@deffn {Scheme Procedure} mysql-service [#:config (mysql-configuration)]
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index f7e08e696..7cdcfc4d7 100644
--- a/gnu/services/databases.scm
+++ b/gnu/services/databases.scm
@@ -48,6 +48,8 @@
postgresql-configuration?
(postgresql postgresql-configuration-postgresql ;<package>
(default postgresql))
+ (port postgresql-configuration-port
+ (default 5432))
(config-file postgresql-configuration-file)
(data-directory postgresql-configuration-data-directory))
@@ -80,7 +82,7 @@ host all all ::1/128 trust"))
(define postgresql-activation
(match-lambda
- (($ <postgresql-configuration> postgresql config-file data-directory)
+ (($ <postgresql-configuration> postgresql port config-file data-directory)
#~(begin
(use-modules (guix build utils)
(ice-9 match))
@@ -108,7 +110,7 @@ host all all ::1/128 trust"))
(define postgresql-shepherd-service
(match-lambda
- (($ <postgresql-configuration> postgresql config-file data-directory)
+ (($ <postgresql-configuration> postgresql port config-file data-directory)
(let ((start-script
;; Wrapper script that switches to the 'postgres' user before
;; launching daemon.
@@ -121,6 +123,7 @@ host all all ::1/128 trust"))
(system* postgres
(string-append "--config-file="
#$config-file)
+ "-p" (number->string #$port)
"-D" #$data-directory)))))
(list (shepherd-service
(provision '(postgres))
@@ -140,6 +143,7 @@ host all all ::1/128 trust"))
(const %postgresql-accounts))))))
(define* (postgresql-service #:key (postgresql postgresql)
+ (port 5432)
(config-file %default-postgres-config)
(data-directory "/var/lib/postgresql/data"))
"Return a service that runs @var{postgresql}, the PostgreSQL database server.
@@ -149,6 +153,7 @@ and stores the database cluster in @var{data-directory}."
(service postgresql-service-type
(postgresql-configuration
(postgresql postgresql)
+ (port port)
(config-file config-file)
(data-directory data-directory))))
--
2.11.0
Re: [PATCH 1/2] services: postgresql: Add port to configuration, Ludovic Courtès, 2016/12/11