postgresql-pgpool-II/pgpool-II-3.0-pgpool.conf-mdkconf.patch
2012-02-01 19:57:31 +04:00

176 lines
5.5 KiB
Diff

diff -p -up pgpool-II-3.0/pgpool.conf.sample.conf~ pgpool-II-3.0/pgpool.conf.sample
--- pgpool-II-3.0/pgpool.conf.sample.conf~ 2010-09-01 06:58:47.000000000 +0200
+++ pgpool-II-3.0/pgpool.conf.sample 2010-09-15 12:26:28.123011879 +0200
@@ -12,15 +12,13 @@ port = 9999
# Port number for pgpool communication manager
pcp_port = 9898
-# Unix domain socket path. (The Debian package defaults to
-# /var/run/postgresql.)
-socket_dir = '/tmp'
+# Unix domain socket path.
+socket_dir = '/var/run/postgresql'
# Unix domain socket path for pgpool communication manager.
-# (Debian package defaults to /var/run/postgresql)
-pcp_socket_dir = '/tmp'
+pcp_socket_dir = '/var/run/postgresql'
-# Unix domain socket path for the backend. Debian package defaults to /var/run/postgresql!
+# Unix domain socket path for the backend.
backend_socket_dir = '/tmp'
# pgpool communication manager timeout. 0 means no timeout. This parameter is ignored now.
@@ -54,7 +52,7 @@ client_idle_limit = 0
authentication_timeout = 60
# Logging directory
-logdir = '/tmp'
+logdir = '/var/log/postgres'
# pid file name
pid_file_name = '/var/run/pgpool/pgpool.pid'
@@ -139,7 +137,7 @@ health_check_timeout = 20
health_check_period = 0
# Health check user
-health_check_user = 'nobody'
+health_check_user = 'pgpool'
# Execute command by failover.
# special values: %d = node id
@@ -220,11 +218,11 @@ system_db_password = ''
#backend_hostname0 = 'host1'
#backend_port0 = 5432
#backend_weight0 = 1
-#backend_data_directory0 = '/data'
+#backend_data_directory0 = '/var/lib/pgsql/data'
#backend_hostname1 = 'host2'
#backend_port1 = 5433
#backend_weight1 = 1
-#backend_data_directory1 = '/data1'
+#backend_data_directory1 = '/var/lib/pgsql/data'
# - HBA -
@@ -233,7 +231,7 @@ enable_pool_hba = false
# - online recovery -
# online recovery user
-recovery_user = 'nobody'
+recovery_user = 'pgpool'
# online recovery password
recovery_password = ''
diff -p -up pgpool-II-3.0/pgpool.conf.sample-master-slave.conf~ pgpool-II-3.0/pgpool.conf.sample-master-slave
--- pgpool-II-3.0/pgpool.conf.sample-master-slave.conf~ 2010-09-01 06:58:47.000000000 +0200
+++ pgpool-II-3.0/pgpool.conf.sample-master-slave 2010-09-15 12:25:53.526669222 +0200
@@ -12,15 +12,13 @@ port = 9999
# Port number for pgpool communication manager
pcp_port = 9898
-# Unix domain socket path. (The Debian package defaults to
-# /var/run/postgresql.)
-socket_dir = '/tmp'
+# Unix domain socket path.
+socket_dir = '/var/run/postgresql'
# Unix domain socket path for pgpool communication manager.
-# (Debian package defaults to /var/run/postgresql)
-pcp_socket_dir = '/tmp'
+pcp_socket_dir = '/var/run/postgresql'
-# Unix domain socket path for the backend. Debian package defaults to /var/run/postgresql!
+# Unix domain socket path for the backend.
backend_socket_dir = '/tmp'
# pgpool communication manager timeout. 0 means no timeout. This parameter is ignored now.
@@ -54,7 +52,7 @@ client_idle_limit = 0
authentication_timeout = 60
# Logging directory
-logdir = '/tmp'
+logdir = '/var/log/postgres'
# pid file name
pid_file_name = '/var/run/pgpool/pgpool.pid'
@@ -139,7 +137,7 @@ health_check_timeout = 20
health_check_period = 0
# Health check user
-health_check_user = 'nobody'
+health_check_user = 'pgpool'
# Execute command by failover.
# special values: %d = node id
@@ -220,11 +218,11 @@ system_db_password = ''
backend_hostname0 = 'host1'
backend_port0 = 5432
backend_weight0 = 1
-backend_data_directory0 = '/data'
+backend_data_directory0 = '/var/lib/pgsql/data'
backend_hostname1 = 'host2'
backend_port1 = 5432
backend_weight1 = 1
-backend_data_directory1 = '/data1'
+backend_data_directory1 = '/var/lib/pgsql/data'
# - HBA -
@@ -233,7 +231,7 @@ enable_pool_hba = false
# - online recovery -
# online recovery user
-recovery_user = 'nobody'
+recovery_user = 'pgpool'
# online recovery password
recovery_password = ''
diff -p -up pgpool-II-3.0/pgpool.conf.sample-replication.conf~ pgpool-II-3.0/pgpool.conf.sample-replication
--- pgpool-II-3.0/pgpool.conf.sample-replication.conf~ 2010-09-01 06:58:47.000000000 +0200
+++ pgpool-II-3.0/pgpool.conf.sample-replication 2010-09-15 12:25:30.630104264 +0200
@@ -12,16 +12,14 @@ port = 9999
# Port number for pgpool communication manager
pcp_port = 9898
-# Unix domain socket path. (The Debian package defaults to
-# /var/run/postgresql.)
-socket_dir = '/tmp'
+# Unix domain socket path.
+socket_dir = '/var/run/postgresql'
# Unix domain socket path for pgpool communication manager.
-# (Debian package defaults to /var/run/postgresql)
-pcp_socket_dir = '/tmp'
+pcp_socket_dir = '/var/run/postgresql'
-# Unix domain socket path for the backend. Debian package defaults to /var/run/postgresql!
-backend_socket_dir = '/tmp'
+# Unix domain socket path for the backend.
+backend_socket_dir = '/var/log/postgres'
# pgpool communication manager timeout. 0 means no timeout. This parameter is ignored now.
pcp_timeout = 10
@@ -54,7 +52,7 @@ client_idle_limit = 0
authentication_timeout = 60
# Logging directory
-logdir = '/tmp'
+logdir = '/var/log/postgres'
# pid file name
pid_file_name = '/var/run/pgpool/pgpool.pid'
@@ -220,11 +218,11 @@ system_db_password = ''
backend_hostname0 = 'host1'
backend_port0 = 5432
backend_weight0 = 1
-backend_data_directory0 = '/data'
+backend_data_directory0 = '/var/lib/pgsql/data'
backend_hostname1 = 'host2'
backend_port1 = 5432
backend_weight1 = 1
-backend_data_directory1 = '/data1'
+backend_data_directory1 = '/var/lib/pgsql/data'
# - HBA -