diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-db/pgpool2/files/pgpool_run_paths.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-db/pgpool2/files/pgpool_run_paths.patch')
-rw-r--r-- | dev-db/pgpool2/files/pgpool_run_paths.patch | 180 |
1 files changed, 180 insertions, 0 deletions
diff --git a/dev-db/pgpool2/files/pgpool_run_paths.patch b/dev-db/pgpool2/files/pgpool_run_paths.patch new file mode 100644 index 000000000000..a1912af15e4c --- /dev/null +++ b/dev-db/pgpool2/files/pgpool_run_paths.patch @@ -0,0 +1,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" |