mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
dev-db/pgpool2: Cleanup 3.7.8, 4.0.3
Package-Manager: Portage-2.3.66, Repoman-2.3.16 Signed-off-by: Aaron W. Swenson <titanofold@gentoo.org>
This commit is contained in:
@@ -1,4 +1,2 @@
|
||||
DIST pgpool-II-3.7.10.tar.gz 3375419 BLAKE2B 96d589e9a3eff631bd4bffdcf321b3b532e5f0985dd4a5948fabc3228400305dc98fbf17ba64e162ecbaecca400e1bb3cad6fc954b2d624292f6f22deb48a789 SHA512 a89c392e336f5dd608c6876011f996fa1e4d7cb4b0eef31c24b2338ac287b72b73948e82429715d38fd9a7a6598f56828192722a2a8ee0d473738b804c4a2a48
|
||||
DIST pgpool-II-3.7.8.tar.gz 3337039 BLAKE2B bce75be04d3c37dffecbc0a1f029d6e97f316cc2497de032ccd4862acc6e7ae64f12ffffdb42a99141e548a2cc616ed02d7eef6ca2f63e222fb400cbad72828c SHA512 0f4e337c2307368cfd38f29c63b9267dd3171dc4b9cd2c59cff564295908e2f561230156a5b690e4d87ce4c8b3174d01b081147e7f5d8ff403d3adc8e7cea7e7
|
||||
DIST pgpool-II-4.0.3.tar.gz 3715976 BLAKE2B c5ecfebc44ee4d6ab8fda5ae0854bb51423252ba518b356a37d3b125bc8f4fac048f6f944fdf9b1ee785aae5ac3eca4c4196adf218bc071dd90b93da5c6e6c08 SHA512 76ffbc8df120d4ef68b761684a1805c0349665375f549cd3a194f7d09b9bbdf70d0824da0cbe975e6d15f850704c4fc7c1a2218f551f88f2ce56f542bdfee9b8
|
||||
DIST pgpool-II-4.0.5.tar.gz 3768842 BLAKE2B 2756d23db950a037a9203aae41293535de25d11bf9860f509040bf5b483ae5fb9e651c8189ee5f0a9398a45d20d2c54566769945e38c52361c160a1162a8e3af SHA512 897df553dba3a1800adae5d22ed4f4fe210a3013fb533730837591244877eeaf0e4090d1a0c65e189b71798b5c303ea22e2198f6317b54f74f10ba48fa2188c6
|
||||
|
||||
@@ -1,268 +0,0 @@
|
||||
diff -ur a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
|
||||
--- a/src/include/parser/pg_config_manual.h 2017-07-10 04:56:18.000000000 -0400
|
||||
+++ b/src/include/parser/pg_config_manual.h 2017-07-11 09:38:46.612907898 -0400
|
||||
@@ -193,7 +193,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 "/run/postgresql"
|
||||
|
||||
/*
|
||||
* This is the default event source for Windows event log.
|
||||
Only in b/src/include/parser: pg_config_manual.h.orig
|
||||
diff -ur a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
|
||||
--- a/src/include/pcp/pcp_stream.h 2017-07-10 04:39:14.000000000 -0400
|
||||
+++ b/src/include/pcp/pcp_stream.h 2017-07-11 09:38:46.612907898 -0400
|
||||
@@ -48,6 +48,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 -ur a/src/include/pool.h b/src/include/pool.h
|
||||
--- a/src/include/pool.h 2017-07-10 04:56:18.000000000 -0400
|
||||
+++ b/src/include/pool.h 2017-07-11 09:38:46.612907898 -0400
|
||||
@@ -73,16 +73,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 -ur a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
|
||||
--- a/src/sample/pgpool.conf.sample 2017-07-10 04:56:18.000000000 -0400
|
||||
+++ b/src/sample/pgpool.conf.sample 2017-07-11 11:05:00.174030914 -0400
|
||||
@@ -31,10 +31,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)
|
||||
listen_backlog_multiplier = 2
|
||||
# Set the backlog parameter of listen(2) to
|
||||
@@ -53,10 +51,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)
|
||||
|
||||
# - Backend Connection Settings -
|
||||
@@ -210,13 +206,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 = '/var/log/pgpool'
|
||||
+logdir = '/run/pgpool'
|
||||
# Directory of pgPool status file
|
||||
# (change requires restart)
|
||||
|
||||
@@ -493,10 +489,8 @@
|
||||
# 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)
|
||||
|
||||
|
||||
diff -ur a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave
|
||||
--- a/src/sample/pgpool.conf.sample-master-slave 2017-07-10 04:56:18.000000000 -0400
|
||||
+++ b/src/sample/pgpool.conf.sample-master-slave 2017-07-11 11:13:57.700698647 -0400
|
||||
@@ -31,10 +31,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)
|
||||
listen_backlog_multiplier = 2
|
||||
# Set the backlog parameter of listen(2) to
|
||||
@@ -53,10 +51,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)
|
||||
|
||||
# - Backend Connection Settings -
|
||||
@@ -210,13 +206,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)
|
||||
|
||||
@@ -492,10 +488,8 @@
|
||||
# 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)
|
||||
|
||||
# - Virtual IP control Setting -
|
||||
diff -ur a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
|
||||
--- a/src/sample/pgpool.conf.sample-replication 2017-07-10 04:56:18.000000000 -0400
|
||||
+++ b/src/sample/pgpool.conf.sample-replication 2017-07-11 11:15:10.613588243 -0400
|
||||
@@ -31,10 +31,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)
|
||||
listen_backlog_multiplier = 2
|
||||
# Set the backlog parameter of listen(2) to
|
||||
@@ -53,10 +51,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)
|
||||
|
||||
# - Backend Connection Settings -
|
||||
@@ -210,13 +206,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)
|
||||
|
||||
@@ -492,10 +488,8 @@
|
||||
# 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)
|
||||
|
||||
|
||||
diff -ur a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
|
||||
--- a/src/sample/pgpool.conf.sample-stream 2017-07-10 04:56:18.000000000 -0400
|
||||
+++ b/src/sample/pgpool.conf.sample-stream 2017-07-11 11:15:50.996675811 -0400
|
||||
@@ -31,10 +31,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)
|
||||
|
||||
|
||||
@@ -47,10 +45,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
|
||||
@@ -211,13 +207,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)
|
||||
|
||||
@@ -492,10 +488,8 @@
|
||||
# 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)
|
||||
|
||||
|
||||
@@ -1,274 +0,0 @@
|
||||
diff --git a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
|
||||
index d7e153b2..a4c9e87a 100644
|
||||
--- a/src/include/parser/pg_config_manual.h
|
||||
+++ b/src/include/parser/pg_config_manual.h
|
||||
@@ -193,7 +193,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 "/run/postgresql"
|
||||
|
||||
/*
|
||||
* This is the default event source for Windows event log.
|
||||
diff --git a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
|
||||
index 254b98cb..5883ad31 100644
|
||||
--- a/src/include/pcp/pcp_stream.h
|
||||
+++ b/src/include/pcp/pcp_stream.h
|
||||
@@ -48,6 +48,6 @@ extern int pcp_read(PCP_CONNECTION *pc, void *buf, int len);
|
||||
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 --git a/src/include/pool.h b/src/include/pool.h
|
||||
index d5dd63aa..a3ae197f 100644
|
||||
--- a/src/include/pool.h
|
||||
+++ b/src/include/pool.h
|
||||
@@ -73,16 +73,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 --git a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
|
||||
index d73c9bca..e95815ba 100644
|
||||
--- a/src/sample/pgpool.conf.sample
|
||||
+++ b/src/sample/pgpool.conf.sample
|
||||
@@ -31,10 +31,8 @@ listen_addresses = 'localhost'
|
||||
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)
|
||||
listen_backlog_multiplier = 2
|
||||
# Set the backlog parameter of listen(2) to
|
||||
@@ -53,10 +51,8 @@ pcp_listen_addresses = '*'
|
||||
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)
|
||||
|
||||
# - Backend Connection Settings -
|
||||
@@ -210,13 +206,13 @@ syslog_ident = 'pgpool'
|
||||
# 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 = '/var/log/pgpool'
|
||||
+logdir = '/run/pgpool'
|
||||
# Directory of pgPool status file
|
||||
# (change requires restart)
|
||||
|
||||
@@ -505,10 +501,8 @@ wd_authkey = ''
|
||||
# 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)
|
||||
|
||||
|
||||
diff --git a/src/sample/pgpool.conf.sample-master-slave b/src/sample/pgpool.conf.sample-master-slave
|
||||
index 612c10a7..ad385ba6 100644
|
||||
--- a/src/sample/pgpool.conf.sample-master-slave
|
||||
+++ b/src/sample/pgpool.conf.sample-master-slave
|
||||
@@ -31,10 +31,8 @@ listen_addresses = 'localhost'
|
||||
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)
|
||||
listen_backlog_multiplier = 2
|
||||
# Set the backlog parameter of listen(2) to
|
||||
@@ -53,10 +51,8 @@ pcp_listen_addresses = '*'
|
||||
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)
|
||||
|
||||
# - Backend Connection Settings -
|
||||
@@ -210,13 +206,13 @@ syslog_ident = 'pgpool'
|
||||
# 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)
|
||||
|
||||
@@ -504,10 +500,8 @@ wd_authkey = ''
|
||||
# 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)
|
||||
|
||||
# - Virtual IP control Setting -
|
||||
diff --git a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
|
||||
index f47a7957..bd7ce73e 100644
|
||||
--- a/src/sample/pgpool.conf.sample-replication
|
||||
+++ b/src/sample/pgpool.conf.sample-replication
|
||||
@@ -31,10 +31,8 @@ listen_addresses = 'localhost'
|
||||
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)
|
||||
listen_backlog_multiplier = 2
|
||||
# Set the backlog parameter of listen(2) to
|
||||
@@ -53,10 +51,8 @@ pcp_listen_addresses = '*'
|
||||
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)
|
||||
|
||||
# - Backend Connection Settings -
|
||||
@@ -210,13 +206,13 @@ syslog_ident = 'pgpool'
|
||||
# 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)
|
||||
|
||||
@@ -504,10 +500,8 @@ wd_authkey = ''
|
||||
# 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)
|
||||
|
||||
|
||||
diff --git a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
|
||||
index d57226b0..669a31d4 100644
|
||||
--- a/src/sample/pgpool.conf.sample-stream
|
||||
+++ b/src/sample/pgpool.conf.sample-stream
|
||||
@@ -31,10 +31,8 @@ listen_addresses = 'localhost'
|
||||
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)
|
||||
|
||||
|
||||
@@ -47,10 +45,8 @@ pcp_listen_addresses = '*'
|
||||
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
|
||||
@@ -211,13 +207,13 @@ syslog_ident = 'pgpool'
|
||||
# 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)
|
||||
|
||||
@@ -504,10 +500,8 @@ wd_authkey = ''
|
||||
# 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)
|
||||
|
||||
|
||||
@@ -1,104 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
POSTGRES_COMPAT=( 9.{4..6} 10 )
|
||||
|
||||
inherit autotools postgres-multi
|
||||
|
||||
MY_P="${PN/2/-II}-${PV}"
|
||||
|
||||
DESCRIPTION="Connection pool server for PostgreSQL"
|
||||
HOMEPAGE="https://www.pgpool.net/"
|
||||
SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
IUSE="doc libressl memcached pam ssl static-libs"
|
||||
|
||||
RDEPEND="
|
||||
${POSTGRES_DEP}
|
||||
net-libs/libnsl:0=
|
||||
memcached? ( dev-libs/libmemcached )
|
||||
pam? ( sys-auth/pambase )
|
||||
ssl? (
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:= )
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
!!dev-db/pgpool
|
||||
sys-devel/bison
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
postgres_new_user pgpool
|
||||
|
||||
postgres-multi_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
eapply \
|
||||
"${FILESDIR}/pgpool-configure-memcached.patch" \
|
||||
"${FILESDIR}/pgpool-configure-pam.patch" \
|
||||
"${FILESDIR}/pgpool-configure-pthread.patch" \
|
||||
"${FILESDIR}/pgpool_run_paths-3.6.5.patch"
|
||||
|
||||
eautoreconf
|
||||
|
||||
postgres-multi_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
postgres-multi_foreach econf \
|
||||
--disable-rpath \
|
||||
--sysconfdir="${EROOT%/}/etc/${PN}" \
|
||||
--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
|
||||
--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_with memcached) \
|
||||
$(use_with pam) \
|
||||
$(use_with ssl openssl)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Even though we're only going to do an install for the best slot
|
||||
# available, the extension bits in src/sql need some things outside
|
||||
# of that directory built, too.
|
||||
postgres-multi_foreach emake
|
||||
postgres-multi_foreach emake -C src/sql
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# We only need the best stuff installed
|
||||
postgres-multi_forbest emake DESTDIR="${D}" install
|
||||
|
||||
# Except for the extension and .so files that each PostgreSQL slot needs
|
||||
postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
|
||||
|
||||
newinitd "${FILESDIR}/${PN}.initd" ${PN}
|
||||
newconfd "${FILESDIR}/${PN}.confd" ${PN}
|
||||
|
||||
# Documentation!
|
||||
dodoc NEWS TODO
|
||||
doman doc/src/sgml/man{1,8}/*
|
||||
use doc && dodoc -r doc/src/sgml/html
|
||||
|
||||
# Examples and extras
|
||||
# mv some files that get installed to /usr/share/pgpool-II so that
|
||||
# they all wind up in the same place
|
||||
mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
|
||||
into "/usr/share/${PN}"
|
||||
dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
|
||||
insinto "/usr/share/${PN}"
|
||||
doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
|
||||
|
||||
# One more thing: Evil la files!
|
||||
find "${ED}" -name '*.la' -exec rm -f {} +
|
||||
}
|
||||
@@ -1,104 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
POSTGRES_COMPAT=( 9.{4..6} {10..11} )
|
||||
|
||||
inherit autotools postgres-multi
|
||||
|
||||
MY_P="${PN/2/-II}-${PV}"
|
||||
|
||||
DESCRIPTION="Connection pool server for PostgreSQL"
|
||||
HOMEPAGE="https://www.pgpool.net/"
|
||||
SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
IUSE="doc libressl memcached pam ssl static-libs"
|
||||
|
||||
RDEPEND="
|
||||
${POSTGRES_DEP}
|
||||
net-libs/libnsl:0=
|
||||
memcached? ( dev-libs/libmemcached )
|
||||
pam? ( sys-auth/pambase )
|
||||
ssl? (
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:= )
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
!!dev-db/pgpool
|
||||
sys-devel/bison
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
postgres_new_user pgpool
|
||||
|
||||
postgres-multi_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
eapply \
|
||||
"${FILESDIR}/pgpool-configure-memcached.patch" \
|
||||
"${FILESDIR}/pgpool-configure-pam.patch" \
|
||||
"${FILESDIR}/pgpool-configure-pthread.patch" \
|
||||
"${FILESDIR}/pgpool_run_paths-3.6.5.patch"
|
||||
|
||||
eautoreconf
|
||||
|
||||
postgres-multi_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
postgres-multi_foreach econf \
|
||||
--disable-rpath \
|
||||
--sysconfdir="${EROOT%/}/etc/${PN}" \
|
||||
--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
|
||||
--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_with memcached) \
|
||||
$(use_with pam) \
|
||||
$(use_with ssl openssl)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Even though we're only going to do an install for the best slot
|
||||
# available, the extension bits in src/sql need some things outside
|
||||
# of that directory built, too.
|
||||
postgres-multi_foreach emake
|
||||
postgres-multi_foreach emake -C src/sql
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# We only need the best stuff installed
|
||||
postgres-multi_forbest emake DESTDIR="${D}" install
|
||||
|
||||
# Except for the extension and .so files that each PostgreSQL slot needs
|
||||
postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
|
||||
|
||||
newinitd "${FILESDIR}/${PN}.initd" ${PN}
|
||||
newconfd "${FILESDIR}/${PN}.confd" ${PN}
|
||||
|
||||
# Documentation!
|
||||
dodoc NEWS TODO
|
||||
doman doc/src/sgml/man{1,8}/*
|
||||
use doc && dodoc -r doc/src/sgml/html
|
||||
|
||||
# Examples and extras
|
||||
# mv some files that get installed to /usr/share/pgpool-II so that
|
||||
# they all wind up in the same place
|
||||
mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
|
||||
into "/usr/share/${PN}"
|
||||
dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
|
||||
insinto "/usr/share/${PN}"
|
||||
doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
|
||||
|
||||
# One more thing: Evil la files!
|
||||
find "${ED}" -name '*.la' -exec rm -f {} +
|
||||
}
|
||||
Reference in New Issue
Block a user