branch core-updates-frozen updated: services: database: Change postgresql default socket.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch core-updates-frozen
in repository guix.

The following commit(s) were added to refs/heads/core-updates-frozen by this 
push:
     new 5029256  services: database: Change postgresql default socket.
5029256 is described below

commit 502925655d1a51aad544804c8ef492a5d24e1776
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Mon Sep 27 19:22:56 2021 +0000

    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.
---
 gnu/services/databases.scm | 4 ++--
 gnu/tests/databases.scm    | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index eba88cd..8d266c1 100644
--- a/gnu/services/databases.scm
+++ b/gnu/services/databases.scm
@@ -116,7 +116,7 @@ host        all     all     ::1/128         md5"))
   (ident-file        postgresql-config-file-ident-file
                      (default %default-postgres-ident))
   (socket-directory  postgresql-config-file-socket-directory
-                     (default #false))
+                     (default "/var/run/postgresql"))
   (extra-config      postgresql-config-file-extra-config
                      (default '())))
 
@@ -364,7 +364,7 @@ and stores the database cluster in @var{data-directory}."
   postgresql-role-configuration make-postgresql-role-configuration
   postgresql-role-configuration?
   (host             postgresql-role-configuration-host ;string
-                    (default "/tmp"))
+                    (default "/var/run/postgresql"))
   (log              postgresql-role-configuration-log ;string
                     (default "/var/log/postgresql_roles.log"))
   (roles            postgresql-role-configuration-roles
diff --git a/gnu/tests/databases.scm b/gnu/tests/databases.scm
index ead8593..a20de1a 100644
--- a/gnu/tests/databases.scm
+++ b/gnu/tests/databases.scm
@@ -228,8 +228,7 @@
                 (let* ((port (open-pipe*
                               OPEN_READ
                               #$(file-append postgresql "/bin/psql")
-                              "-tAh" "/tmp"
-                              "-c" "SELECT 1 FROM pg_database WHERE
+                              "-tA" "-c" "SELECT 1 FROM pg_database WHERE
  datname='root'"))
                        (output (get-string-all port)))
                   (close-pipe port)