File postgresql-var-run-socket.patch of Package postgresql96

Overview Repositories Revisions Requests Users Attributes Meta

File postgresql-var-run-socket.patch of Package postgresql96 (Revision 9cd4223a06de70f41d6e822e1cdb39ea)

Currently displaying revision 9cd4223a06de70f41d6e822e1cdb39ea , 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.6beta1/src/bin/pg_upgrade/test.sh
===================================================================
--- postgresql-9.6beta1.orig/src/bin/pg_upgrade/test.sh
+++ postgresql-9.6beta1/src/bin/pg_upgrade/test.sh
@@ -148,6 +148,12 @@ done
 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.6beta1/src/backend/utils/misc/guc.c
===================================================================
--- postgresql-9.6beta1.orig/src/backend/utils/misc/guc.c
+++ postgresql-9.6beta1/src/backend/utils/misc/guc.c
@@ -3353,7 +3353,7 @@ static struct config_string ConfigureNam
 		},
 		&Unix_socket_directories,
 #ifdef HAVE_UNIX_SOCKETS
-		DEFAULT_PGSOCKET_DIR,
+		DEFAULT_PGSOCKET_DIR ", /tmp",
 #else
 		"",
 #endif
Index: postgresql-9.6beta1/src/bin/initdb/initdb.c
===================================================================
--- postgresql-9.6beta1.orig/src/bin/initdb/initdb.c
+++ postgresql-9.6beta1/src/bin/initdb/initdb.c
@@ -1221,7 +1221,7 @@ setup_config(void)
 
 #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.6beta1/src/include/pg_config_manual.h
===================================================================
--- postgresql-9.6beta1.orig/src/include/pg_config_manual.h
+++ postgresql-9.6beta1/src/include/pg_config_manual.h
@@ -164,7 +164,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"
 
 /*
  * This is the default event source for Windows event log.

Places

File postgresql-var-run-socket.patch of Package postgresql96 (Revision 9cd4223a06de70f41d6e822e1cdb39ea)

Places