summaryrefslogtreecommitdiff
path: root/gnu/services
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2016-12-14 08:35:48 +0000
committerLudovic Courtès <ludo@gnu.org>2016-12-15 16:54:22 +0100
commit2d3d5cc5ea9d4b991f2f640543ad70c902bc0191 (patch)
tree4ac61a636af78cb85d2cca9e3fa3ce551f7b8c23 /gnu/services
parenteee7878f4e972f0c13bde3a1cdf4caa1085af472 (diff)
services: postgresql: Add port to configuration
* gnu/services/databases.scm (<postgresql-configuration>): Add port field. (postgresql-shepherd-service): Pass port to postgres. (postgresql-service): Add port default. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/services')
-rw-r--r--gnu/services/databases.scm9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index f7e08e6967..7cdcfc4d79 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))))