From 95f64d02cd153f4671512d97959759e395a8aef5 Mon Sep 17 00:00:00 2001
From: Nozomi Anzai <anzai@sraoss.co.jp>
Date: Mon, 13 May 2013 15:44:07 +0900
Subject: [PATCH] Add the parameters added for pgpool-II 3.3.
 (wd_lifecheck_dbname, wd_lifecheck_user, wd_lifecheck_password)

---
 common.php                     |  7 +++++++
 definePgpoolConfParam.php      | 15 +++++++++++++++
 templates/help/en/pgconfig.tpl | 25 +++++++++++++++++++++++++
 templates/help/ja/pgconfig.tpl | 24 ++++++++++++++++++++++++
 templates/pgconfig.tpl         | 23 +++++++++++++++++++++++
 5 files changed, 94 insertions(+)

diff --git a/common.php b/common.php
index 1cddd7b..b149210 100644
--- a/common.php
+++ b/common.php
@@ -542,6 +542,13 @@ function paramExists($param)
     switch ($param) {
         /* Add */
 
+        // params added in 3.3
+        case 'wd_lifecheck_dbname':
+        case 'wd_lifecheck_user':
+        case 'wd_lifecheck_password':
+            $add_version = 3.3;
+            break;
+
         // params added in 3.2
         case 'health_check_max_retries':
         case 'health_check_retry_delay':
diff --git a/definePgpoolConfParam.php b/definePgpoolConfParam.php
index 2298047..29145b1 100644
--- a/definePgpoolConfParam.php
+++ b/definePgpoolConfParam.php
@@ -598,6 +598,21 @@ $pgpoolConfigParam[$key]['type'] = 'C';
 $pgpoolConfigParam[$key]['default'] = 'SELECT 1';
 $pgpoolConfigParam[$key]['regexp'] = $anyelse;
 
+$key = 'wd_lifecheck_dbname';
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = 'template1';
+$pgpoolConfigParam[$key]['regexp'] = $anyelse;
+
+$key = 'wd_lifecheck_user';
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = 'nobody';
+$pgpoolConfigParam[$key]['regexp'] = $anyelse;
+
+$key = 'wd_lifecheck_password';
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '';
+$pgpoolConfigParam[$key]['regexp'] = $anyelse;
+
 # Other pgpool Connection Settings
 
 $key = 'other_pgpool_hostname';
diff --git a/templates/help/en/pgconfig.tpl b/templates/help/en/pgconfig.tpl
index 8316f83..916ddaf 100644
--- a/templates/help/en/pgconfig.tpl
+++ b/templates/help/en/pgconfig.tpl
@@ -1662,6 +1662,31 @@ black_function_list = 'nextval,setval,lastval,currval'
       </td>
     </tr>
 
+    <tr>
+      <th id="WD_LIFECHECK_DBNAME"><label>{$message.descWd_lifecheck_dbname|escape}</label>
+      <p>wd_lifecheck_dbnam(string) *</th>
+      <td>
+      <p>The database name connected for checking pgpool-II. Default is "template1"</p>
+      </td>
+    </tr>
+
+    <tr>
+      <th id="WD_LIFECHECK_USER"><label>{$message.descWd_lifecheck_user|escape}</label>
+      <p>wd_lifecheck_user(string) *</th>
+      <td>
+      <p>The user name to check pgpool-II. This user must exist in all the PostgreSQL backends.
+         Default is "nobody" .</p>
+      </td>
+    </tr>
+
+    <tr>
+      <th id="WD_LIFECHECK_PASSWORD"><label>{$message.descWd_lifecheck_password|escape}</label>
+      <p>wd_lifecheck_query (string) *</th>
+      <td>
+      <p>The password of the user to check pgpool-II. Default is "".</p>
+      </td>
+    </tr>
+
     <tr><th class="category" colspan="2">Virtual IP address</th></tr>
 
     <tr>
diff --git a/templates/help/ja/pgconfig.tpl b/templates/help/ja/pgconfig.tpl
index 29b4a00..28ed2a4 100644
--- a/templates/help/ja/pgconfig.tpl
+++ b/templates/help/ja/pgconfig.tpl
@@ -1734,6 +1734,30 @@ black_function_list = 'nextval,setval,lastval,currval'
       </td>
     </tr>
 
+    <tr>
+      <th id="WD_LIFECHECK_DBNAME"><label>{$message.descWd_lifecheck_dbname|escape}</label>
+      <p>wd_lifecheck_dbnam(string) *</th>
+      <td>
+      <p>pgpool-II の死活監視を行なうのに接続するデータベースです。 デフォルトは "template1" です。</p>
+      </td>
+    </tr>
+
+    <tr>
+      <th id="WD_LIFECHECK_USER"><label>{$message.descWd_lifecheck_user|escape}</label>
+      <p>wd_lifecheck_user(string) *</th>
+      <td>
+      <p>pgpool-II の死活監視を行なうユーザです。 デフォルトは "nobody" です。</p>
+      </td>
+    </tr>
+
+    <tr>
+      <th id="WD_LIFECHECK_PASSWORD"><label>{$message.descWd_lifecheck_password|escape}</label>
+      <p>wd_lifecheck_query (string) *</th>
+      <td>
+      <p>pgpool-II の死活監視を行なうユーザのパスワードです。 </p>
+      </td>
+    </tr>
+
     <tr><th class="category" colspan="2">Virtual IP address</th></tr>
 
     <tr>
diff --git a/templates/pgconfig.tpl b/templates/pgconfig.tpl
index c49c59b..0d79bfc 100644
--- a/templates/pgconfig.tpl
+++ b/templates/pgconfig.tpl
@@ -1277,6 +1277,29 @@ function delOtherWatchdog(num){
         <td colspan="2"><input type="text" name="wd_lifecheck_query" value="{$params.wd_lifecheck_query|escape}"/></td>
         </tr>
 
+        {if paramExists('wd_lifecheck_dbname')}
+        <tr>
+        <th{if isset($error.wd_lifecheck_dbname)} class="error"{/if}>
+        <label>{$message.descWd_lifecheck_dbname|escape}</label>
+        <br />wd_lifecheck_dbname (string) *</th>
+        <td colspan="2"><input type="text" name="wd_lifecheck_dbname" value="{$params.wd_lifecheck_dbname|escape}"/></td>
+        </tr>
+
+        <tr>
+        <th{if isset($error.wd_lifecheck_user)} class="error"{/if}>
+        <label>{$message.descWd_lifecheck_user|escape}</label>
+        <br />wd_lifecheck_user (string) *</th>
+        <td colspan="2"><input type="text" name="wd_lifecheck_user" value="{$params.wd_lifecheck_user|escape}"/></td>
+        </tr>
+
+        <tr>
+        <th{if isset($error.wd_lifecheck_password)} class="error"{/if}>
+        <label>{$message.descWd_lifecheck_password|escape}</label>
+        <br />wd_lifecheck_password (string) *</th>
+        <td colspan="2"><input type="text" name="wd_lifecheck_password" value="{$params.wd_lifecheck_password|escape}"/></td>
+        </tr>
+        {/if}
+
         <tr><th class="category" colspan="3">Virtual IP address</th></tr>
 
         <tr>
-- 
2.39.5