summary refs log tree commit diff
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2021-09-27 19:22:56 +0000
committerMathieu Othacehe <othacehe@gnu.org>2021-09-27 19:22:56 +0000
commit502925655d1a51aad544804c8ef492a5d24e1776 (patch)
treef9cff6bbdb53a294b1c5dd8ece8f6f21dfb8c8e8
parent02c43445544426aa4eebfd08289161509bc21460 (diff)
downloadguix-502925655d1a51aad544804c8ef492a5d24e1776.tar.gz
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.
-rw-r--r--gnu/services/databases.scm4
-rw-r--r--gnu/tests/databases.scm3
2 files changed, 3 insertions, 4 deletions
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index eba88cdb68..8d266c1cba 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 ead8593854..a20de1a8c7 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)