File postgresql-var-run-socket.patch of Package postgresql94-libs

Overview Repositories Revisions Requests Users Attributes Meta

File postgresql-var-run-socket.patch of Package postgresql94-libs (Revision c5a3f1a3c2cbf5c1ea8de9367f9bdbd5)

Currently displaying revision c5a3f1a3c2cbf5c1ea8de9367f9bdbd5 , Show latest

Change the built-in default socket directory to be /var/run/postgresql.
For backwards compatibility with (probably non-libpq-based) clients that
might still expect to find the socket in /tmp, also create a socket in
/tmp.  This is to resolve communication problems with clients operating
under systemd's PrivateTmp environment, which won't be using the same
global /tmp directory as the server; see bug #825448.

Note that we apply the socket directory change at the level of the
hard-wired defaults in the C code, not by just twiddling the setting in
postgresql.conf.sample; this is so that the change will take effect on
server package update, without requiring any existing postgresql.conf
to be updated.  (Of course, a user who dislikes this behavior can still
override it via postgresql.conf.)

Index: postgresql-9.3.5/contrib/pg_upgrade/test.sh
===================================================================
--- postgresql-9.3.5.orig/contrib/pg_upgrade/test.sh	2014-07-25 12:48:53.890020586 +0200
+++ postgresql-9.3.5/contrib/pg_upgrade/test.sh	2014-07-25 12:54:10.221108886 +0200
@@ -138,6 +138,12 @@
 EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --port=$PGPORT"
 export EXTRA_REGRESS_OPTS
 
+# we want the Unix sockets in $temp_root
+PGHOST=$temp_root
+export PGHOST
+
+POSTMASTER_OPTS="$POSTMASTER_OPTS -c unix_socket_directories='$PGHOST'"
+
 # enable echo so the user can see what is being executed
 set -x
 
Index: postgresql-9.3.5/src/backend/utils/misc/guc.c
===================================================================
--- postgresql-9.3.5.orig/src/backend/utils/misc/guc.c	2014-07-25 12:48:53.893020625 +0200
+++ postgresql-9.3.5/src/backend/utils/misc/guc.c	2014-07-25 12:54:10.223108912 +0200
@@ -2971,7 +2971,7 @@
 		},
 		&Unix_socket_directories,
 #ifdef HAVE_UNIX_SOCKETS
-		DEFAULT_PGSOCKET_DIR,
+		DEFAULT_PGSOCKET_DIR ", /tmp",
 #else
 		"",
 #endif
Index: postgresql-9.3.5/src/bin/initdb/initdb.c
===================================================================
--- postgresql-9.3.5.orig/src/bin/initdb/initdb.c	2014-07-25 12:48:53.894020638 +0200
+++ postgresql-9.3.5/src/bin/initdb/initdb.c	2014-07-25 12:54:10.223108912 +0200
@@ -1204,7 +1204,7 @@
 
 #ifdef HAVE_UNIX_SOCKETS
 	snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'",
-			 DEFAULT_PGSOCKET_DIR);
+			 DEFAULT_PGSOCKET_DIR ", /tmp");
 #else
 	snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''");
 #endif
Index: postgresql-9.3.5/src/include/pg_config_manual.h
===================================================================
--- postgresql-9.3.5.orig/src/include/pg_config_manual.h	2014-07-25 12:48:53.894020638 +0200
+++ postgresql-9.3.5/src/include/pg_config_manual.h	2014-07-25 12:54:10.224108925 +0200
@@ -144,7 +144,7 @@
  * here's where to twiddle it.  You can also override this at runtime
  * with the postmaster's -k switch.
  */
-#define DEFAULT_PGSOCKET_DIR  "/tmp"
+#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
 
 /*
  * The random() function is expected to yield values between 0 and

Places

File postgresql-var-run-socket.patch of Package postgresql94-libs (Revision c5a3f1a3c2cbf5c1ea8de9367f9bdbd5)

Places