From a865636f3ae129a5388b40680262a481107852f0 Mon Sep 17 00:00:00 2001

From: Alexey Shabalin <shaba@altlinux.org>

Date: Tue, 8 Feb 2022 16:20:26 +0300

Subject: [PATCH] Update path for socket and log

---

 src/include/pool.h                        |  6 +++---

 src/sample/pgpool.conf.sample-logical     | 12 ++++++------

 src/sample/pgpool.conf.sample-raw         |  8 ++++----

 src/sample/pgpool.conf.sample-replication |  8 ++++----

 src/sample/pgpool.conf.sample-slony       |  8 ++++----

 src/sample/pgpool.conf.sample-snapshot    |  8 ++++----

 src/sample/pgpool.conf.sample-stream      |  8 ++++----

 7 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/include/pool.h b/src/include/pool.h

index ff47184c..1cd96be4 100644

--- a/src/include/pool.h

+++ b/src/include/pool.h

@@ -69,13 +69,13 @@

 #define HBA_CONF_FILE_NAME "pool_hba.conf"

 /* pid file directory */

-#define DEFAULT_LOGDIR "/tmp"

+#define DEFAULT_LOGDIR "/var/log/pgpool"

 /* Unix domain socket directory */

-#define DEFAULT_SOCKET_DIR "/tmp"

+#define DEFAULT_SOCKET_DIR "/var/run/pgpool"

 /* Unix domain socket directory for watchdog IPC */

-#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"

+#define DEFAULT_WD_IPC_SOCKET_DIR "/var/run/pgpool"

 /* pid file name */

 #define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"

diff --git a/src/sample/pgpool.conf.sample-logical b/src/sample/pgpool.conf.sample-logical

index b156250a..eacbce92 100644

--- a/src/sample/pgpool.conf.sample-logical

+++ b/src/sample/pgpool.conf.sample-logical

@@ -35,10 +35,10 @@ listen_addresses = 'localhost'

                                    # Host name or IP address to listen on:

                                    # '*' for all, '' for no TCP/IP connections

                                    # (change requires restart)

-port = 9999

+port = 5433

                                    # Port number

                                    # (change requires restart)

-socket_dir = '/tmp'

+socket_dir = '/var/run/pgpool'

                                    # Unix domain socket path

                                    # The Debian package defaults to

                                    # /var/run/postgresql

@@ -58,7 +58,7 @@ pcp_listen_addresses = '*'

 pcp_port = 9898

                                    # Port number for pcp

                                    # (change requires restart)

-pcp_socket_dir = '/tmp'

+pcp_socket_dir = '/var/run/pgpool'

                                    # Unix domain socket path for pcp

                                    # The Debian package defaults to

                                    # /var/run/postgresql

@@ -258,7 +258,7 @@ syslog_ident = 'pgpool'

 # -- Only used if logging_collector is on ---

-#log_directory = '/tmp/pgpool_logs'

+#log_directory = '/var/log/pgpool'

                                         # directory where log files are written,

                                         # can be absolute

 #log_filename = 'pgpool-%Y-%m-%d_%H%M%S.log'

@@ -298,7 +298,7 @@ pid_file_name = '/var/run/pgpool/pgpool.pid'

                                    # location of pgpool.conf file or

                                    # as an absolute path

                                    # (change requires restart)

-logdir = '/tmp'

+logdir = '/var/log/pgpool'

                                    # Directory of pgPool status file

                                    # (change requires restart)

@@ -627,7 +627,7 @@ wd_authkey = ''

                                     # Authentication key for watchdog communication

                                     # (change requires restart)

-wd_ipc_socket_dir = '/tmp'

+wd_ipc_socket_dir = '/var/run/pgpool'

                                     # Unix domain socket path for watchdog IPC socket

                                     # The Debian package defaults to

                                     # /var/run/postgresql

diff --git a/src/sample/pgpool.conf.sample-raw b/src/sample/pgpool.conf.sample-raw

index 76846f8e..4dca897b 100644

--- a/src/sample/pgpool.conf.sample-raw

+++ b/src/sample/pgpool.conf.sample-raw

@@ -39,7 +39,7 @@ listen_addresses = 'localhost'

 port = 9999

                                    # Port number

                                    # (change requires restart)

-socket_dir = '/tmp'

+socket_dir = '/var/run/pgpool'

                                    # Unix domain socket path

                                    # The Debian package defaults to

                                    # /var/run/postgresql

@@ -59,7 +59,7 @@ pcp_listen_addresses = '*'

 pcp_port = 9898

                                    # Port number for pcp

                                    # (change requires restart)

-pcp_socket_dir = '/tmp'

+pcp_socket_dir = '/var/run/pgpool'

                                    # Unix domain socket path for pcp

                                    # The Debian package defaults to

                                    # /var/run/postgresql

@@ -259,7 +259,7 @@ syslog_ident = 'pgpool'

 # -- Only used if logging_collector is on ---

-#log_directory = '/tmp/pgpool_logs'

+#log_directory = '/var/log/pgpool'

                                         # directory where log files are written,

                                         # can be absolute

 #log_filename = 'pgpool-%Y-%m-%d_%H%M%S.log'

@@ -299,7 +299,7 @@ pid_file_name = '/var/run/pgpool/pgpool.pid'

                                    # location of pgpool.conf file or

                                    # as an absolute path

                                    # (change requires restart)

-logdir = '/tmp'

+logdir = '/var/log/pgpool'

                                    # Directory of pgPool status file

                                    # (change requires restart)

diff --git a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication

index b4b41a67..b86d1cd8 100644

--- a/src/sample/pgpool.conf.sample-replication

+++ b/src/sample/pgpool.conf.sample-replication

@@ -39,7 +39,7 @@ listen_addresses = 'localhost'

 port = 9999

                                    # Port number

                                    # (change requires restart)

-socket_dir = '/tmp'

+socket_dir = '/var/run/pgpool'

                                    # Unix domain socket path

                                    # The Debian package defaults to

                                    # /var/run/postgresql

@@ -65,7 +65,7 @@ pcp_listen_addresses = '*'

 pcp_port = 9898

                                    # Port number for pcp

                                    # (change requires restart)

-pcp_socket_dir = '/tmp'

+pcp_socket_dir = '/var/run/pgpool'

                                    # Unix domain socket path for pcp

                                    # The Debian package defaults to

                                    # /var/run/postgresql

@@ -254,7 +254,7 @@ syslog_ident = 'pgpool'

 # -- Only used if logging_collector is on ---

-#log_directory = '/tmp/pgpool_logs'

+#log_directory = '/var/log/pgpool'

                                         # directory where log files are written,

                                         # can be absolute

 #log_filename = 'pgpool-%Y-%m-%d_%H%M%S.log'

@@ -294,7 +294,7 @@ pid_file_name = '/var/run/pgpool/pgpool.pid'

                                    # location of pgpool.conf file or

                                    # as an absolute path

                                    # (change requires restart)

-logdir = '/tmp'

+logdir = '/var/log/pgpool'

                                    # Directory of pgPool status file

                                    # (change requires restart)

diff --git a/src/sample/pgpool.conf.sample-slony b/src/sample/pgpool.conf.sample-slony

index fd4e09df..464c4845 100644

--- a/src/sample/pgpool.conf.sample-slony

+++ b/src/sample/pgpool.conf.sample-slony

@@ -39,7 +39,7 @@ listen_addresses = 'localhost'

 port = 9999

                                    # Port number

                                    # (change requires restart)

-socket_dir = '/tmp'

+socket_dir = '/var/run/pgpool'

                                    # Unix domain socket path

                                    # The Debian package defaults to

                                    # /var/run/postgresql

@@ -65,7 +65,7 @@ pcp_listen_addresses = '*'

 pcp_port = 9898

                                    # Port number for pcp

                                    # (change requires restart)

-pcp_socket_dir = '/tmp'

+pcp_socket_dir = '/var/run/pgpool'

                                    # Unix domain socket path for pcp

                                    # The Debian package defaults to

                                    # /var/run/postgresql

@@ -255,7 +255,7 @@ syslog_ident = 'pgpool'

 # -- Only used if logging_collector is on ---

-#log_directory = '/tmp/pgpool_logs'

+#log_directory = '/var/log/pgpool'

                                         # directory where log files are written,

                                         # can be absolute

 #log_filename = 'pgpool-%Y-%m-%d_%H%M%S.log'

@@ -295,7 +295,7 @@ pid_file_name = '/var/run/pgpool/pgpool.pid'

                                    # location of pgpool.conf file or

                                    # as an absolute path

                                    # (change requires restart)

-logdir = '/tmp'

+logdir = '/var/log/pgpool'

                                    # Directory of pgPool status file

                                    # (change requires restart)

diff --git a/src/sample/pgpool.conf.sample-snapshot b/src/sample/pgpool.conf.sample-snapshot

index 9d2ddc2d..15439188 100644

--- a/src/sample/pgpool.conf.sample-snapshot

+++ b/src/sample/pgpool.conf.sample-snapshot

@@ -39,7 +39,7 @@ listen_addresses = 'localhost'

 port = 9999

                                    # Port number

                                    # (change requires restart)

-socket_dir = '/tmp'

+socket_dir = '/var/run/pgpool'

                                    # Unix domain socket path

                                    # The Debian package defaults to

                                    # /var/run/postgresql

@@ -65,7 +65,7 @@ pcp_listen_addresses = '*'

 pcp_port = 9898

                                    # Port number for pcp

                                    # (change requires restart)

-pcp_socket_dir = '/tmp'

+pcp_socket_dir = '/var/run/pgpool'

                                    # Unix domain socket path for pcp

                                    # The Debian package defaults to

                                    # /var/run/postgresql

@@ -252,7 +252,7 @@ syslog_ident = 'pgpool'

 # -- Only used if logging_collector is on ---

-#log_directory = '/tmp/pgpool_logs'

+#log_directory = '/var/log/pgpool'

                                         # directory where log files are written,

                                         # can be absolute

 #log_filename = 'pgpool-%Y-%m-%d_%H%M%S.log'

@@ -292,7 +292,7 @@ pid_file_name = '/var/run/pgpool/pgpool.pid'

                                    # location of pgpool.conf file or

                                    # as an absolute path

                                    # (change requires restart)

-logdir = '/tmp'

+logdir = '/var/log/pgpool'

                                    # Directory of pgPool status file

                                    # (change requires restart)

diff --git a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream

index bb8d9fe1..3c10c230 100644

--- a/src/sample/pgpool.conf.sample-stream

+++ b/src/sample/pgpool.conf.sample-stream

@@ -39,7 +39,7 @@ listen_addresses = 'localhost'

 port = 9999

                                    # Port number

                                    # (change requires restart)

-socket_dir = '/tmp'

+socket_dir = '/var/run/pgpool'

                                    # Unix domain socket path

                                    # The Debian package defaults to

                                    # /var/run/postgresql

@@ -59,7 +59,7 @@ pcp_listen_addresses = '*'

 pcp_port = 9898

                                    # Port number for pcp

                                    # (change requires restart)

-pcp_socket_dir = '/tmp'

+pcp_socket_dir = '/var/run/pgpool'

                                    # Unix domain socket path for pcp

                                    # The Debian package defaults to

                                    # /var/run/postgresql

@@ -259,7 +259,7 @@ syslog_ident = 'pgpool'

 # -- Only used if logging_collector is on ---

-#log_directory = '/tmp/pgpool_logs'

+#log_directory = '/var/log/pgpool'

                                         # directory where log files are written,

                                         # can be absolute

 #log_filename = 'pgpool-%Y-%m-%d_%H%M%S.log'

@@ -298,7 +298,7 @@ pid_file_name = '/var/run/pgpool/pgpool.pid'

                                    # location of pgpool.conf file or

                                    # as an absolute path

                                    # (change requires restart)

-logdir = '/tmp'

+logdir = '/var/log/pgpool'

                                    # Directory of pgPool status file

                                    # (change requires restart)

-- 

2.33.0