1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
|
diff -Naruw a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
--- a/src/include/parser/pg_config_manual.h
+++ b/src/include/parser/pg_config_manual.h
@@ -227,7 +227,7 @@
* support them yet.
*/
#ifndef WIN32
-#define DEFAULT_PGSOCKET_DIR "/tmp"
+#define DEFAULT_PGSOCKET_DIR "/run/postgresql"
#else
#define DEFAULT_PGSOCKET_DIR ""
#endif
diff -Naruw a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
--- a/src/include/pcp/pcp_stream.h
+++ b/src/include/pcp/pcp_stream.h
@@ -49,6 +49,6 @@
extern int pcp_write(PCP_CONNECTION * pc, void *buf, int len);
extern int pcp_flush(PCP_CONNECTION * pc);
-#define UNIX_DOMAIN_PATH "/tmp"
+#define UNIX_DOMAIN_PATH "/run/pgpool"
#endif /* PCP_STREAM_H */
diff -Naruw a/src/include/pool.h b/src/include/pool.h
--- a/src/include/pool.h
+++ b/src/include/pool.h
@@ -69,16 +69,16 @@
#define HBA_CONF_FILE_NAME "pool_hba.conf"
/* pid file directory */
-#define DEFAULT_LOGDIR "/tmp"
+#define DEFAULT_LOGDIR "/run/pgpool"
/* Unix domain socket directory */
-#define DEFAULT_SOCKET_DIR "/tmp"
+#define DEFAULT_SOCKET_DIR "/run/postgresql"
/* Unix domain socket directory for watchdog IPC */
-#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
+#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool"
/* pid file name */
-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
+#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid"
/* status file name */
#define STATUS_FILE_NAME "pgpool_status"
diff -Naruw a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
--- a/src/sample/pgpool.conf.sample
+++ b/src/sample/pgpool.conf.sample
@@ -39,10 +39,8 @@
#port = 9999
# Port number
# (change requires restart)
-#socket_dir = '/tmp'
+socket_dir = '/run/postgresql'
# Unix domain socket path
- # The Debian package defaults to
- # /var/run/postgresql
# (change requires restart)
#reserved_connections = 0
# Number of reserved connections.
@@ -59,10 +57,8 @@
#pcp_port = 9898
# Port number for pcp
# (change requires restart)
-#pcp_socket_dir = '/tmp'
+pcp_socket_dir = '/run/pgpool'
# Unix domain socket path for pcp
- # The Debian package defaults to
- # /var/run/postgresql
# (change requires restart)
#listen_backlog_multiplier = 2
# Set the backlog parameter of listen(2) to
@@ -292,13 +288,13 @@
# FILE LOCATIONS
#------------------------------------------------------------------------------
-#pid_file_name = '/var/run/pgpool/pgpool.pid'
+pid_file_name = '/run/pgpool/pgpool.pid'
# PID file name
# Can be specified as relative to the"
# location of pgpool.conf file or
# as an absolute path
# (change requires restart)
-#logdir = '/tmp'
+logdir = '/run/pgpool'
# Directory of pgPool status file
# (change requires restart)
@@ -676,8 +672,6 @@
# Authentication key for watchdog communication
# (change requires restart)
-#wd_ipc_socket_dir = '/tmp'
+wd_ipc_socket_dir = '/run/pgpool'
# Unix domain socket path for watchdog IPC socket
- # The Debian package defaults to
- # /var/run/postgresql
# (change requires restart)
|
GitWeb