pgpool2.git / summary / log / commit / refs
commit 9aaa9cfd9e71d7a7217aa31ec76ea7f4c17935fb
Author: Bo Peng <pengbo@sraoss.co.jp>
Date: Mon Aug 05 06:52:53 2024 +0000
Change the default value of *_user parameters to ''.
Currently the default values of *_user parameters are "nobody".
This commit changes the default value of *_user parameters to ''.
doc.ja/src/sgml/healthcheck.sgml | 2 ++
doc.ja/src/sgml/online-recovery.sgml | 2 ++
doc.ja/src/sgml/stream-check.sgml | 2 ++
doc.ja/src/sgml/watchdog.sgml | 4 ++--
doc/src/sgml/healthcheck.sgml | 1 +
doc/src/sgml/online-recovery.sgml | 4 ++++
doc/src/sgml/stream-check.sgml | 1 +
doc/src/sgml/watchdog.sgml | 2 +-
src/config/pool_config_variables.c | 10 +++++-----
src/sample/pgpool.conf.sample-stream | 10 +++++-----
10 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/doc.ja/src/sgml/healthcheck.sgml b/doc.ja/src/sgml/healthcheck.sgml
index 1f143ddb3..736d0d1a9 100644
--- a/doc.ja/src/sgml/healthcheck.sgml
+++ b/doc.ja/src/sgml/healthcheck.sgml
@@ -145,10 +145,12 @@
<para>
<!--
Specifies the <productname>PostgreSQL</> user name to perform health check.
+ Default is <literal>''</literal>(empty).
The same user must exist in all the <productname>PostgreSQL</> backends.
Otherwise, health check results in an error.
-->
ヘルスチェックを行う<productname>PostgreSQL</>ユーザ名を指定します。
+ デフォルトは<literal>''</literal>（空文字）です。
同じユーザ名が全ての<productname>PostgreSQL</>バックエンドに存在していなければなりません。
さもないと、ヘルスチェックがエラーとなります。
</para>
diff --git a/doc.ja/src/sgml/online-recovery.sgml b/doc.ja/src/sgml/online-recovery.sgml
index a214db894..aa0617b1b 100644
--- a/doc.ja/src/sgml/online-recovery.sgml
+++ b/doc.ja/src/sgml/online-recovery.sgml
@@ -252,11 +252,13 @@
<para>
<!--
Specifies the <productname>PostgreSQL</> user name to perform online recovery.
+ Default is <literal>''</literal>(empty).
<varname>recovery_user</varname> must specify superuser,
because <function>pgpool_recovery</function> function is executed
during online recovery, require superuser privilege.
-->
オンラインリカバリを行うための<productname>PostgreSQL</>ユーザ名です。
+ デフォルトは<literal>''</literal>（空文字）です。
オンラインリカバリで実行される<function>pgpool_recovery</function>関数はPostgreSQLのスーパーユーザ権限が必要なため、<varname>recovery_user</varname>にスーパーユーザを指定しなければなりません。
</para>
<para>
diff --git a/doc.ja/src/sgml/stream-check.sgml b/doc.ja/src/sgml/stream-check.sgml
index 70008ab5e..ea064e132 100644
--- a/doc.ja/src/sgml/stream-check.sgml
+++ b/doc.ja/src/sgml/stream-check.sgml
@@ -74,10 +74,12 @@
<para>
<!--
Specifies the <productname>PostgreSQL</> user name to perform streaming replication check.
+ Default is <literal>''</literal>(empty).
The user must have LOGIN privilege and exist on all the
<productname>PostgreSQL</> backends.
-->
ストリーミングレプリケーションのチェックを行う<productname>PostgreSQL</>ユーザ名を指定します。
+ デフォルトは<literal>''</literal>（空文字）です。
このユーザはLOGIN権限を持ち、すべてのバックエンドに存在しなければなりません。
</para>
<para>
diff --git a/doc.ja/src/sgml/watchdog.sgml b/doc.ja/src/sgml/watchdog.sgml
index 9c311294b..b989385c0 100644
--- a/doc.ja/src/sgml/watchdog.sgml
+++ b/doc.ja/src/sgml/watchdog.sgml
@@ -1901,10 +1901,10 @@ heartbeat_device2 = ''
<!--
Specifies the user name for the connection used for the life
check of remote <productname>Pgpool-II</productname>.
- Default is <literal>"nobody"</literal>.
+ Default is <literal>''</literal>(empty).
-->
リモートの<productname>Pgpool-II</productname>の死活監視用の接続先のユーザ名です。
- デフォルトは<literal>'nobody'</literal>です。
+ デフォルトは<literal>''</literal>（空文字）です。
</para>
<para>
<!--
diff --git a/doc/src/sgml/healthcheck.sgml b/doc/src/sgml/healthcheck.sgml
index 86d8b4c69..b00286380 100644
--- a/doc/src/sgml/healthcheck.sgml
+++ b/doc/src/sgml/healthcheck.sgml
@@ -98,6 +98,7 @@
<listitem>
<para>
Specifies the <productname>PostgreSQL</> user name to perform health check.
+ Default is <literal>''</literal>(empty).
The same user must exist in all the <productname>PostgreSQL</> backends.
Otherwise, health check causes an error.
</para>
diff --git a/doc/src/sgml/online-recovery.sgml b/doc/src/sgml/online-recovery.sgml
index 38a9611c0..55092a744 100644
--- a/doc/src/sgml/online-recovery.sgml
+++ b/doc/src/sgml/online-recovery.sgml
@@ -189,6 +189,10 @@
<listitem>
<para>
Specifies the <productname>PostgreSQL</> user name to perform online recovery.
+ Default is <literal>''</literal>(empty).
+ <varname>recovery_user</varname> must specify superuser,
+ because <function>pgpool_recovery</function> function is executed
+ during online recovery, require superuser privilege.
</para>
<para>
This parameter can be changed by reloading the <productname>Pgpool-II</> configurations.
diff --git a/doc/src/sgml/stream-check.sgml b/doc/src/sgml/stream-check.sgml
index c86c9322c..e44dae93f 100644
--- a/doc/src/sgml/stream-check.sgml
+++ b/doc/src/sgml/stream-check.sgml
@@ -49,6 +49,7 @@
<para>
Specifies the <productname>PostgreSQL</> user name to perform streaming replication check.
+ Default is <literal>''</literal>(empty).
The user must have LOGIN privilege and exist on all the
<productname>PostgreSQL</> backends.
</para>
diff --git a/doc/src/sgml/watchdog.sgml b/doc/src/sgml/watchdog.sgml
index e732c6d23..5ee8d12af 100644
--- a/doc/src/sgml/watchdog.sgml
+++ b/doc/src/sgml/watchdog.sgml
@@ -1327,7 +1327,7 @@ pgpool_port2 = 9999
<para>
Specifies the user name for the connection used for the life
check of remote <productname>Pgpool-II</productname>.
- Default is <literal>"nobody"</literal>.
+ Default is <literal>''</literal>(empty).
</para>
<para>
<varname>wd_lifecheck_user</varname> is only applicable if the
diff --git a/src/config/pool_config_variables.c b/src/config/pool_config_variables.c
index 111efa579..770cfc24e 100644
--- a/src/config/pool_config_variables.c
+++ b/src/config/pool_config_variables.c
@@ -946,7 +946,7 @@ static struct config_string ConfigureNamesString[] =
CONFIG_VAR_TYPE_STRING, false, 0
},
&g_pool_config.sr_check_user,
- "nobody",
+ "",
NULL, NULL, NULL, NULL
},
@@ -1006,7 +1006,7 @@ static struct config_string ConfigureNamesString[] =
CONFIG_VAR_TYPE_STRING, false, 0
},
&g_pool_config.recovery_user,
- "nobody",
+ "",
NULL, NULL, NULL, NULL
},
@@ -1196,7 +1196,7 @@ static struct config_string ConfigureNamesString[] =
CONFIG_VAR_TYPE_STRING, false, 0
},
&g_pool_config.wd_lifecheck_user,
- "nobody",
+ "",
NULL, NULL, NULL, NULL
},
@@ -1852,14 +1852,14 @@ static struct config_string_array ConfigureNamesStringArray[] =
CONFIG_VAR_TYPE_STRING_ARRAY, true, 0, MAX_NUM_BACKENDS
},
NULL,
- "nobody",
+ "",
{
{"health_check_user", CFGCXT_RELOAD, HEALTH_CHECK_CONFIG,
"Default PostgreSQL user name to perform health check on node for which health_check_user[node-id] is not specified.",
CONFIG_VAR_TYPE_STRING, false, DEFAULT_FOR_NO_VALUE_ARRAY_VAR
},
&g_pool_config.health_check_user,
- "nobody",
+ "",
NULL, NULL, NULL, NULL
},
HealthCheckUserAssignFunc, NULL, HealthCheckUserShowFunc, BackendSlotEmptyCheckFunc
diff --git a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
index f329dcb32..b2f672759 100644
--- a/src/sample/pgpool.conf.sample-stream
+++ b/src/sample/pgpool.conf.sample-stream
@@ -503,7 +503,7 @@ backend_clustering_mode = 'streaming_replication'
#sr_check_period = 10
# Streaming replication check period
# Default is 10s.
-#sr_check_user = 'nobody'
+#sr_check_user = ''
# Streaming replication check user
# This is necessary even if you disable streaming
# replication delay check by sr_check_period = 0
@@ -558,7 +558,7 @@ backend_clustering_mode = 'streaming_replication'
#health_check_timeout = 20
# Health check timeout
# 0 means no timeout
-#health_check_user = 'nobody'
+#health_check_user = ''
# Health check user
#health_check_password = ''
# Password for health check user
@@ -583,7 +583,7 @@ backend_clustering_mode = 'streaming_replication'
#------------------------------------------------------------------------------
#health_check_period0 = 0
#health_check_timeout0 = 20
-#health_check_user0 = 'nobody'
+#health_check_user0 = ''
#health_check_password0 = ''
#health_check_database0 = ''
#health_check_max_retries0 = 0
@@ -655,7 +655,7 @@ backend_clustering_mode = 'streaming_replication'
# ONLINE RECOVERY
#------------------------------------------------------------------------------
-#recovery_user = 'nobody'
+#recovery_user = ''
# Online recovery user
#recovery_password = ''
# Online recovery password
@@ -900,7 +900,7 @@ backend_clustering_mode = 'streaming_replication'
#wd_lifecheck_dbname = 'template1'
# Database name connected for lifecheck
# (change requires restart)
-#wd_lifecheck_user = 'nobody'
+#wd_lifecheck_user = ''
# watchdog user monitoring pgpools in lifecheck
# (change requires restart)
#wd_lifecheck_password = ''
[parent: 2cde5031af91]