mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-12 06:06:53 -05:00
services: database: Change postgresql default socket.
Adapt to the postgresql default socket directory set to /var/run/postgresql. * gnu/services/databases.scm (<postgresql-config-file>)[socket-directory]: Set to /var/run/postgresql. (<postgresql-role-configuration>): Ditto. * gnu/tests/databases.scm (run-postgresql-test): Adapt it.
This commit is contained in:
parent
02c4344554
commit
502925655d
2 changed files with 3 additions and 4 deletions
|
@ -116,7 +116,7 @@ (define-record-type* <postgresql-config-file>
|
||||||
(ident-file postgresql-config-file-ident-file
|
(ident-file postgresql-config-file-ident-file
|
||||||
(default %default-postgres-ident))
|
(default %default-postgres-ident))
|
||||||
(socket-directory postgresql-config-file-socket-directory
|
(socket-directory postgresql-config-file-socket-directory
|
||||||
(default #false))
|
(default "/var/run/postgresql"))
|
||||||
(extra-config postgresql-config-file-extra-config
|
(extra-config postgresql-config-file-extra-config
|
||||||
(default '())))
|
(default '())))
|
||||||
|
|
||||||
|
@ -364,7 +364,7 @@ (define-record-type* <postgresql-role-configuration>
|
||||||
postgresql-role-configuration make-postgresql-role-configuration
|
postgresql-role-configuration make-postgresql-role-configuration
|
||||||
postgresql-role-configuration?
|
postgresql-role-configuration?
|
||||||
(host postgresql-role-configuration-host ;string
|
(host postgresql-role-configuration-host ;string
|
||||||
(default "/tmp"))
|
(default "/var/run/postgresql"))
|
||||||
(log postgresql-role-configuration-log ;string
|
(log postgresql-role-configuration-log ;string
|
||||||
(default "/var/log/postgresql_roles.log"))
|
(default "/var/log/postgresql_roles.log"))
|
||||||
(roles postgresql-role-configuration-roles
|
(roles postgresql-role-configuration-roles
|
||||||
|
|
|
@ -228,8 +228,7 @@ (define marionette
|
||||||
(let* ((port (open-pipe*
|
(let* ((port (open-pipe*
|
||||||
OPEN_READ
|
OPEN_READ
|
||||||
#$(file-append postgresql "/bin/psql")
|
#$(file-append postgresql "/bin/psql")
|
||||||
"-tAh" "/tmp"
|
"-tA" "-c" "SELECT 1 FROM pg_database WHERE
|
||||||
"-c" "SELECT 1 FROM pg_database WHERE
|
|
||||||
datname='root'"))
|
datname='root'"))
|
||||||
(output (get-string-all port)))
|
(output (get-string-all port)))
|
||||||
(close-pipe port)
|
(close-pipe port)
|
||||||
|
|
Loading…
Reference in a new issue