summaryrefslogtreecommitdiff
path: root/gnu/tests
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2021-04-12 21:41:41 +0100
committerLeo Famulari <leo@famulari.name>2021-04-12 19:12:46 -0400
commitc311147bd16aa0e5746d9cbf31502f5fd61e470c (patch)
tree62ca20f3ad7114d7a550607039e3460dae4efbe6 /gnu/tests
parent1bbed20332746d13b7494177a232120e80d4d5d5 (diff)
services: postgresql: Change service default socket directory.
Fixes <https://bugs.gnu.org/46737>. PostgreSQL running with a different socket directory to the default one in the package itself breaks some services, this commit restores the previous behaviour where PostgreSQL by default will run with a socket directory that matches the default used by PostgreSQL packaged for Guix. Switching to a different default value can happen, but only alongside changing the PostgreSQL package. * gnu/services/databases.scm (<postgresql-config-file>)[socket-directory]: Change default to #false. * doc/guix.texi (Database Services): Update documentation, and specify a different value for disabling connections via sockets. * gnu/tests/guix.scm (%guix-data-service-os): Use default PostgreSQL behaviour. * gnu/tests/monitoring.scm (%zabbix-os): Likewise. * gnu/tests/web.scm (patchwork-os): Likewise. Signed-off-by: Leo Famulari <leo@famulari.name>
Diffstat (limited to 'gnu/tests')
-rw-r--r--gnu/tests/guix.scm5
-rw-r--r--gnu/tests/monitoring.scm7
-rw-r--r--gnu/tests/web.scm7
3 files changed, 3 insertions, 16 deletions
diff --git a/gnu/tests/guix.scm b/gnu/tests/guix.scm
index 219b8b482f..af7d8f0b21 100644
--- a/gnu/tests/guix.scm
+++ b/gnu/tests/guix.scm
@@ -164,10 +164,7 @@
"
local all all trust
host all all 127.0.0.1/32 trust
-host all all ::1/128 trust"))
- ;; XXX: Remove when postgresql default socket directory is
- ;; changed to /var/run/postgresql.
- (socket-directory #f)))))
+host all all ::1/128 trust"))))))
(service guix-data-service-type
(guix-data-service-configuration
(host "0.0.0.0")))
diff --git a/gnu/tests/monitoring.scm b/gnu/tests/monitoring.scm
index be69e1c259..8630f5818c 100644
--- a/gnu/tests/monitoring.scm
+++ b/gnu/tests/monitoring.scm
@@ -309,12 +309,7 @@ zabbix||{}
(service dhcp-client-service-type)
(service postgresql-service-type
(postgresql-configuration
- (postgresql postgresql)
- ;; XXX: Remove when postgresql default socket directory is
- ;; changed to /var/run/postgresql.
- (config-file
- (postgresql-config-file
- (socket-directory #f)))))
+ (postgresql postgresql)))
(service zabbix-front-end-service-type
(zabbix-front-end-configuration
(db-password "zabbix")))
diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm
index cc0e79c8b2..7f4518acd2 100644
--- a/gnu/tests/web.scm
+++ b/gnu/tests/web.scm
@@ -569,12 +569,7 @@ HTTP-PORT."
(listen '("8080"))))))
(service postgresql-service-type
(postgresql-configuration
- (postgresql postgresql-10)
- ;; XXX: Remove when postgresql default socket directory is
- ;; changed to /var/run/postgresql.
- (config-file
- (postgresql-config-file
- (socket-directory #f)))))
+ (postgresql postgresql-10)))
(service patchwork-service-type
(patchwork-configuration
(patchwork patchwork)