From: Christopher Baines <mail@cbaines.net>
To: guix-devel@gnu.org
Subject: [PATCH 1/2] services: postgresql: Add port to configuration
Date: Sun, 11 Dec 2016 21:13:00 +0000 [thread overview]
Message-ID: <20161211211301.28403-1-mail@cbaines.net> (raw)
* gnu/services/postgresql.scm (<postgresql-configuration>): Add port
field.
(postgresql-shepherd-service): Pass port to postgres.
(postgresql-service): Add port default.
---
gnu/services/databases.scm | 36 +++++++++++++++++++++---------------
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index 1eed85542..3850ba502 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,20 +110,22 @@ host all all ::1/128 trust"))
(define postgresql-shepherd-service
(match-lambda
- (($ <postgresql-configuration> postgresql config-file data-directory)
- (let ((start-script
- ;; Wrapper script that switches to the 'postgres' user before
- ;; launching daemon.
- (program-file "start-postgres"
- #~(let ((user (getpwnam "postgres"))
- (postgres (string-append #$postgresql
- "/bin/postgres")))
- (setgid (passwd:gid user))
- (setuid (passwd:uid user))
- (system* postgres
- (string-append "--config-file="
- #$config-file)
- "-D" #$data-directory)))))
+ (($ <postgresql-configuration> postgresql port config-file data-directory)
+ (let* ((string-port (number->string port))
+ (start-script
+ ;; Wrapper script that switches to the 'postgres' user before
+ ;; launching daemon.
+ (program-file "start-postgres"
+ #~(let ((user (getpwnam "postgres"))
+ (postgres (string-append #$postgresql
+ "/bin/postgres")))
+ (setgid (passwd:gid user))
+ (setuid (passwd:uid user))
+ (system* postgres
+ (string-append "--config-file="
+ #$config-file)
+ "-p" #$string-port
+ "-D" #$data-directory)))))
(list (shepherd-service
(provision '(postgres))
(documentation "Run the PostgreSQL daemon.")
@@ -140,6 +144,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 +154,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
next reply other threads:[~2016-12-11 21:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-11 21:13 Christopher Baines [this message]
2016-12-11 21:13 ` [PATCH 2/2] services: postgresql: Add locale to configuration Christopher Baines
2016-12-11 23:14 ` Ludovic Courtès
2016-12-12 6:53 ` Christopher Baines
2016-12-13 23:09 ` Ludovic Courtès
2016-12-14 8:35 ` [PATCH 1/2] services: postgresql: Add port " Christopher Baines
2016-12-14 8:35 ` [PATCH 2/2] services: postgresql: Add locale " Christopher Baines
2016-12-15 15:55 ` Ludovic Courtès
2016-12-15 15:54 ` [PATCH 1/2] services: postgresql: Add port " Ludovic Courtès
2016-12-11 23:02 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161211211301.28403-1-mail@cbaines.net \
--to=mail@cbaines.net \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).