Allow users to change the following pgpool.conf parameters through pgpoolAdmin.

* log_connections
* log_hostname
* enable_pool_hba

Added messages to lang/*. *French messages are in English*

diff --git a/definePgpoolConfParam.php b/definePgpoolConfParam.php
index f2ef97c60c22e8e2849a06d8b9c082da5f93e74d..993977858d2e711848fbb3774812e9656f627e70 100644 (file)
--- a/definePgpoolConfParam.php
+++ b/definePgpoolConfParam.php
@@ -172,6 +172,14 @@ $key = 'parallel_mode';
 $pgpoolConfigParam[$key]['type'] ='B';
 $pgpoolConfigParam[$key]['default'] =false;
 
+$key = 'log_connections';
+$pgpoolConfigParam[$key]['type'] = 'B';
+$pgpoolConfigParam[$key]['default'] = false;
+
+$key = 'log_hostname';
+$pgpoolConfigParam[$key]['type'] = 'B';
+$pgpoolConfigParam[$key]['default'] = false;
+
 $key = 'log_statement';
 $pgpoolConfigParam[$key]['type'] ='B';
 $pgpoolConfigParam[$key]['default'] =false;
@@ -180,6 +188,10 @@ $key = 'enable_query_cache';
 $pgpoolConfigParam[$key]['type'] ='B';
 $pgpoolConfigParam[$key]['default'] =false;
 
+$key = 'enable_pool_hba';
+$pgpoolConfigParam[$key]['type'] ='B';
+$pgpoolConfigParam[$key]['default'] =false;
+
 $key = 'system_db_hostname';
 $pgpoolConfigParam[$key]['type'] ='C';
 $pgpoolConfigParam[$key]['default'] ='system_db_hostname';

diff --git a/lang/en.lang.php b/lang/en.lang.php
index 83a07e18a3c909d0ed1c554623a643f4934e5286..962779e4b4196ce3c815c53475eed63d9fbc8774 100644 (file)
--- a/lang/en.lang.php
+++ b/lang/en.lang.php
@@ -37,6 +37,7 @@ $message = array(
        'descAuthentication_timeout' => 'Maximum time in seconds to complete client authentication',
     'descConnection_cache' => 'If true, cache connections to PostgreSQL',
     'descConnection_life_time' => 'Life time for each idle connection in seconds',
+    'descEnable_pool_hba' => 'Use host-based authentication',
     'descEnable_query_cache' => 'Perform query cache',
     'descFailover_command' => 'Command to be executed when detaching a node',
     'descFailback_command' => 'Command to be executed when attaching a node',
@@ -47,6 +48,8 @@ $message = array(
     'descInsert_lock' => ' If you replicate a table having SERIAL data type column, sometimes the serial value does not match between servers',
     'descListen_addresses' => 'Specifies the addresses to listen on for TCP/IP connections',
     'descLoad_balance_mode' => 'Perform load balancing for SELECT',
+       'descLog_connections' => 'If true, incoming connections will be printed to the log',
+       'descLog_hostname' => 'If true, hostname will be shown in ps status and in connection log if log_connections is true',
     'descLog_statement' => 'If true, print all statements to the log',
     'descLogdir' => 'The directory name to store pgpool\'s log files',
     'descMaster_slave_mode' => 'Run in master/slave mode',
@@ -248,14 +251,14 @@ $message = array(
     'e3005' => 'The SQL error occurred when DELETE was executed',
     'e3006' => 'pgpool.conf not found.',
     'e4001' => 'pgpool.conf not found.',
-    'e4002' => 'It is not possible to read to pgpool.conf. ',
-    'e4003' => 'It is not possible to write to pgpool.conf. ',
+    'e4002' => 'Could not read from pgpool.conf. ',
+    'e4003' => 'Could not write to pgpool.conf. ',
     'e5001' => 'pgmgt.conf.php not found.',
-    'e5002' => 'It is not possible to read to pgmgt.conf.php.',
-    'e5003' => 'It is not possible to write to pgmgt.conf.php.',
+    'e5002' => 'Could not read from pgmgt.conf.php.',
+    'e5003' => 'Coult not write to pgmgt.conf.php.',
     'e6001' => 'pcp.conf not found.',
-    'e6002' => 'It is not possible to read to pcp.conf. ',
-    'e6003' => 'It is not possible to write to pcp.conf. ',
+    'e6002' => 'Could not read from pcp.conf. ',
+    'e6003' => 'Could not write to pcp.conf. ',
     'e7001' => 'pcp.conf not found.',
     'e8001' => 'Detailed information cannot be acquired.',
     

diff --git a/lang/fr.lang.php b/lang/fr.lang.php
index c038a98ee87b24d79cf30a7ce8230c5aa1222a72..ef66567cc450d46cf15c0902fc65d1a1b276b24b 100644 (file)
--- a/lang/fr.lang.php
+++ b/lang/fr.lang.php
@@ -37,6 +37,7 @@ $message = array(
     'descAuthentication_timeout' => 'Durée maximum en secondes pour terminer l\'authentification du client',
     'descConnection_cache' => 'Si vrai, met en cache les connexions vers PostgreSQL',
     'descConnection_life_time' => 'Durée de vie de chaque connexion inutilisée en secondes',
+    'descEnable_pool_hba' => 'Use host-based authentication',
     'descEnable_query_cache' => 'Mettre en place un cache des requêtes',
     'descFailover_command' => 'Commande à exécuter lors du détachement d\'un noeud',
     'descFailback_command' => 'Commande à exécuter lors de l\'attachement d\'un noeud',
@@ -47,6 +48,8 @@ $message = array(
     'descInsert_lock' => ' Si vous répliquez une table possédant une colonne de type SERIAL, quelque fois, la valeur de serial ne sera pas identique parmi les serveurs',
     'descListen_addresses' => 'Spécifie les adresses à écouter pour les connexions TCP/IP',
     'descLoad_balance_mode' => 'Réalise une répartition de charge pour les requêtes SELECT',
+       'descLog_connections' => 'If true, incoming connections will be printed to the log',
+       'descLog_hostname' => 'If true, hostname will be shown in ps status and in connection log if log_connections is true',
     'descLog_statement' => 'Si vrai, trace toutes les requêtes dans les journaux',
     'descLogdir' => 'Le nom du répertoire où stocker les journaux de pgpool',
     'descMaster_slave_mode' => 'Exécuter le mode maître/esclave',

diff --git a/lang/ja.lang.php b/lang/ja.lang.php
index 081586ce7a4f7f8b48f6e4580b54d7f683cdd481..e27a6d2f291dc110d870447865562c4c44be0a19 100644 (file)
--- a/lang/ja.lang.php
+++ b/lang/ja.lang.php
@@ -37,7 +37,8 @@ $message = array(
        'descAuthentication_timeout' => 'クライアント認証のタイムアウト時間(秒)',
     'descConnection_cache' => 'コネクションをキャッシュ',
     'descConnection_life_time' => 'コネクションプール中のコネクションの有効期間(秒)',
-    'descEnable_query_cache' => 'クエリキャッシュ機能の有効化',
+       'descEnable_pool_hba' => 'クライアント認証機能を有効にする',
+    'descEnable_query_cache' => 'クエリキャッシュ機能を有効にする',
     'descFailover_command' => 'ノード切り離し時に起動するコマンド',
     'descFailback_command' => 'ノード復帰時に起動するコマンド',
     'descHealth_check_period' => 'ヘルスチェックを行う間隔(秒)',
@@ -47,6 +48,8 @@ $message = array(
     'descInsert_lock' => '自動的にトランザクションの開始，テーブルロック，トランザクションの終了',
     'descListen_addresses' => 'TCP/IPコネクションを受け付けるアドレス',
     'descLoad_balance_mode' => 'レプリケーションモード時にSELECT文を各ノードにロードバランス',
+       'descLog_connections' => 'trueならば受信した接続のログを出力',
+       'descLog_hostname' => 'trueならばホスト名を"ps"ステータスに出力。log_connectionsがtrue であればログにも出力',
     'descLog_statement' => 'trueならばSQL文をログ出力',
     'descLogdir' => 'pgpoolの各種ログファイルを格納するディレクトリ',
     'descMaster_slave_mode' => 'マスタ/スレーブモードでpgpoolを運転',
@@ -252,7 +255,7 @@ $message = array(
     'e3006' => 'pgpool.confが見つかりません',
     'e4001' => 'pgpool.confが見つかりません',
     'e4002' => 'pgpool.confから読み込みができません',
-    'e4003' => 'pgpool.confiに書き込みができません',
+    'e4003' => 'pgpool.confに書き込みができません',
     'e5001' => 'pgmgt.conf.phpが見つかりません',
     'e5002' => 'pgmgt.conf.phpから読み込みができません',
     'e5003' => 'pgmgt.conf.phpに書き込みができません',

diff --git a/templates/pgconfig.tpl b/templates/pgconfig.tpl
index 507ea24ed70303f3c88afb5baab5821c0e7d7aec..4d4c2b611dba6298cdb56b7674245263393ba3b6 100644 (file)
--- a/templates/pgconfig.tpl
+++ b/templates/pgconfig.tpl
@@ -380,7 +380,47 @@ function cancelNode() {
           <td><input type="checkbox" name="print_timestamp" id="print_timestamp" value="true" checked="checked" /></td>
           {else}
           <td><input type="checkbox" name="print_timestamp" id="print_timestamp" value="false" /></td>
-          {/if} </tr>
+          {/if}
+               </tr>
+        <tr> {if $error.log_statement != null}
+          <th class="error"><label>{$message.descLog_statement|escape}</label>
+                                       <br />log_statement</th>
+          {else}
+          <th><label>{$message.descLog_statement|escape}</label>
+                                       <br />log_statement</th>
+          {/if}
+          {if $params.log_statement == 'true'}
+          <td><input type="checkbox" name="log_statement" id="log_statement" value="true" checked="checked" /></td>
+          {else}
+          <td><input type="checkbox" name="log_statement" id="log_statement" value="false" /></td>
+          {/if}
+               </tr>
+        <tr> {if $error.log_connections != null}
+          <th class="error"><label>{$message.descLog_connections|escape}</label>
+                                       <br />log_connections</th>
+          {else}
+          <th><label>{$message.descLog_connections|escape}</label>
+                                       <br />log_connections</th>
+          {/if}
+          {if $params.log_connections == 'true'}
+          <td><input type="checkbox" name="log_connections" id="log_connections" value="true" checked="checked" /></td>
+          {else}
+          <td><input type="checkbox" name="log_connections" id="log_connections" value="false" /></td>
+          {/if}
+               </tr>
+        <tr> {if $error.log_hostname != null}
+          <th class="error"><label>{$message.descLog_hostname|escape}</label>
+                                       <br />log_hostname</th>
+          {else}
+          <th><label>{$message.descLog_hostname|escape}</label>
+                                       <br />log_hostname</th>
+          {/if}
+          {if $params.log_hostname == 'true'}
+          <td><input type="checkbox" name="log_hostname" id="log_hostname" value="true" checked="checked" /></td>
+          {else}
+          <td><input type="checkbox" name="log_hostname" id="log_hostname" value="false" /></td>
+          {/if}
+               </tr>
       </tbody>
     </table>
     <h3><a name="replication" id="replication">Replication</a></h3>
@@ -680,18 +720,6 @@ function cancelNode() {
           {else}
           <td><input type="checkbox" name="ignore_leading_white_space" id="ignore_leading_white_space" value="false" /></td>
           {/if} </tr>
-        <tr> {if $error.log_statement != null}
-          <th class="error"><label>{$message.descLog_statement|escape}</label>
-                                       <br />log_statement</th>
-          {else}
-          <th><label>{$message.descLog_statement|escape}</label>
-                                       <br />log_statement</th>
-          {/if}
-          {if $params.log_statement == 'true'}
-          <td><input type="checkbox" name="log_statement" id="log_statement" value="true" checked="checked" /></td>
-          {else}
-          <td><input type="checkbox" name="log_statement" id="log_statement" value="false" /></td>
-          {/if} </tr>
         <tr> {if $error.parallel_mode != null}
           <th class="error"><label>{$message.descParallel_mode|escape}</label>
                                        <br />parallel_mode</th>
@@ -716,6 +744,18 @@ function cancelNode() {
           {else}
           <td><input type="checkbox" name="enable_query_cache" id="enable_query_cache" /></td>
           {/if} </tr>
+        <tr> {if $error.enable_pool_hba != null}
+          <th class="error"><label>{$message.descEnable_pool_hba|escape}</label>
+                                       <br />enable_pool_hba</th>
+          {else}
+          <th><label>{$message.descEnable_pool_hba|escape}</label>
+                                       <br />enable_pool_hba</th>
+          {/if}
+          {if $params.enable_pool_hba == 'true'}
+          <td><input type="checkbox" name="enable_pool_hba" id="enable_pool_hba" checked="checked" /></td>
+          {else}
+          <td><input type="checkbox" name="enable_pool_hba" id="enable_pool_hba" /></td>
+          {/if} </tr>
         <tr> {if $error.failover_command != null}
           <th class="error"><label>{$message.descFailover_command|escape}</label>
           <br />failover_command (string)</th>