You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
53 lines
2.0 KiB
53 lines
2.0 KiB
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.) |
|
|
|
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c |
|
index 4dde819652..8c2f601333 100644 |
|
--- a/src/backend/utils/misc/guc.c |
|
+++ b/src/backend/utils/misc/guc.c |
|
@@ -4159,7 +4159,7 @@ static struct config_string ConfigureNamesString[] = |
|
}, |
|
&Unix_socket_directories, |
|
#ifdef HAVE_UNIX_SOCKETS |
|
- DEFAULT_PGSOCKET_DIR, |
|
+ DEFAULT_PGSOCKET_DIR ", /tmp", |
|
#else |
|
"", |
|
#endif |
|
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c |
|
index 4ff0c6c700..6ccd96b1f2 100644 |
|
--- a/src/bin/initdb/initdb.c |
|
+++ b/src/bin/initdb/initdb.c |
|
@@ -1091,7 +1091,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 |
|
diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h |
|
index 8f3ec6bde1..066daf3f08 100644 |
|
--- a/src/include/pg_config_manual.h |
|
+++ b/src/include/pg_config_manual.h |
|
@@ -201,7 +201,7 @@ |
|
* support them yet. |
|
*/ |
|
#ifndef WIN32 |
|
-#define DEFAULT_PGSOCKET_DIR "/tmp" |
|
+#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql" |
|
#else |
|
#define DEFAULT_PGSOCKET_DIR "" |
|
#endif
|
|
|