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
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
|
diff -Naurw a/pgpool.conf.sample b/pgpool.conf.sample
--- a/pgpool.conf.sample 2012-07-19 03:06:21.000000000 -0400
+++ b/pgpool.conf.sample 2012-08-14 07:33:39.200695855 -0400
@@ -31,10 +31,8 @@
port = 9999
# Port number
# (change requires restart)
-socket_dir = '/tmp'
+socket_dir = '@PGSQL_SOCKETDIR@'
# Unix domain socket path
- # The Debian package defaults to
- # /var/run/postgresql
# (change requires restart)
@@ -43,10 +41,8 @@
pcp_port = 9898
# Port number for pcp
# (change requires restart)
-pcp_socket_dir = '/tmp'
+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
# Unix domain socket path for pcp
- # The Debian package defaults to
- # /var/run/postgresql
# (change requires restart)
# - Backend Connection Settings -
@@ -176,10 +172,10 @@
# FILE LOCATIONS
#------------------------------------------------------------------------------
-pid_file_name = '/var/run/pgpool/pgpool.pid'
+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
# PID file name
# (change requires restart)
-logdir = '/tmp'
+logdir = '@PGPOOL_SOCKETDIR@'
# Directory of pgPool status file
# (change requires restart)
diff -Naurw a/pgpool.conf.sample-master-slave b/pgpool.conf.sample-master-slave
--- a/pgpool.conf.sample-master-slave 2012-07-16 22:56:37.000000000 -0400
+++ b/pgpool.conf.sample-master-slave 2012-08-14 07:33:39.201695842 -0400
@@ -31,10 +31,8 @@
port = 9999
# Port number
# (change requires restart)
-socket_dir = '/tmp'
+socket_dir = '@PGSQL_SOCKETDIR@'
# Unix domain socket path
- # The Debian package defaults to
- # /var/run/postgresql
# (change requires restart)
@@ -43,10 +41,8 @@
pcp_port = 9898
# Port number for pcp
# (change requires restart)
-pcp_socket_dir = '/tmp'
+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
# Unix domain socket path for pcp
- # The Debian package defaults to
- # /var/run/postgresql
# (change requires restart)
# - Backend Connection Settings -
@@ -176,10 +172,10 @@
# FILE LOCATIONS
#------------------------------------------------------------------------------
-pid_file_name = '/var/run/pgpool/pgpool.pid'
+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
# PID file name
# (change requires restart)
-logdir = '/tmp'
+logdir = '@PGPOOL_SOCKETDIR@'
# Directory of pgPool status file
# (change requires restart)
diff -Naurw a/pgpool.conf.sample-replication b/pgpool.conf.sample-replication
--- a/pgpool.conf.sample-replication 2012-07-16 22:56:37.000000000 -0400
+++ b/pgpool.conf.sample-replication 2012-08-14 07:33:39.202695830 -0400
@@ -31,10 +31,8 @@
port = 9999
# Port number
# (change requires restart)
-socket_dir = '/tmp'
+socket_dir = '@PGSQL_SOCKETDIR@'
# Unix domain socket path
- # The Debian package defaults to
- # /var/run/postgresql
# (change requires restart)
@@ -43,10 +41,8 @@
pcp_port = 9898
# Port number for pcp
# (change requires restart)
-pcp_socket_dir = '/tmp'
+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
# Unix domain socket path for pcp
- # The Debian package defaults to
- # /var/run/postgresql
# (change requires restart)
# - Backend Connection Settings -
@@ -176,10 +172,10 @@
# FILE LOCATIONS
#------------------------------------------------------------------------------
-pid_file_name = '/var/run/pgpool/pgpool.pid'
+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
# PID file name
# (change requires restart)
-logdir = '/tmp'
+logdir = '@PGPOOL_SOCKETDIR@'
# Directory of pgPool status file
# (change requires restart)
diff -Naurw a/pgpool.conf.sample-stream b/pgpool.conf.sample-stream
--- a/pgpool.conf.sample-stream 2012-07-16 22:56:37.000000000 -0400
+++ b/pgpool.conf.sample-stream 2012-08-14 07:33:39.203695818 -0400
@@ -31,10 +31,8 @@
port = 9999
# Port number
# (change requires restart)
-socket_dir = '/tmp'
+socket_dir = '@PGSQL_SOCKETDIR@'
# Unix domain socket path
- # The Debian package defaults to
- # /var/run/postgresql
# (change requires restart)
@@ -43,10 +41,8 @@
pcp_port = 9898
# Port number for pcp
# (change requires restart)
-pcp_socket_dir = '/tmp'
+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
# Unix domain socket path for pcp
- # The Debian package defaults to
- # /var/run/postgresql
# (change requires restart)
# - Backend Connection Settings -
@@ -176,10 +172,10 @@
# FILE LOCATIONS
#------------------------------------------------------------------------------
-pid_file_name = '/var/run/pgpool/pgpool.pid'
+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
# PID file name
# (change requires restart)
-logdir = '/tmp'
+logdir = '@PGPOOL_SOCKETDIR@'
# Directory of pgPool status file
# (change requires restart)
diff -Naurw a/pool.h b/pool.h
--- a/pool.h 2012-07-02 00:09:18.000000000 -0400
+++ b/pool.h 2012-08-14 07:26:56.005764702 -0400
@@ -61,13 +61,13 @@
#define HBA_CONF_FILE_NAME "pool_hba.conf"
/* pid file directory */
-#define DEFAULT_LOGDIR "/tmp"
+#define DEFAULT_LOGDIR "@PGPOOL_SOCKETDIR@"
/* Unix domain socket directory */
-#define DEFAULT_SOCKET_DIR "/tmp"
+#define DEFAULT_SOCKET_DIR "@PGSQL_SOCKETDIR@"
/* pid file name */
-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
+#define DEFAULT_PID_FILE_NAME "@PGPOOL_SOCKETDIR@/pgpool.pid"
/* status file name */
#define STATUS_FILE_NAME "pgpool_status"
|
GitWeb