summary refs log tree commit diff
path: root/gnu/tests/monitoring.scm
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/monitoring.scm
parent1bbed20332746d13b7494177a232120e80d4d5d5 (diff)
downloadguix-c311147bd16aa0e5746d9cbf31502f5fd61e470c.tar.gz
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/monitoring.scm')
-rw-r--r--gnu/tests/monitoring.scm7
1 files changed, 1 insertions, 6 deletions
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")))