From 502925655d1a51aad544804c8ef492a5d24e1776 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 27 Sep 2021 19:22:56 +0000 Subject: services: database: Change postgresql default socket. Adapt to the postgresql default socket directory set to /var/run/postgresql. * gnu/services/databases.scm ()[socket-directory]: Set to /var/run/postgresql. (): 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(-) (limited to 'gnu') 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) -- cgit 1.4.1