Add some params of pgpool.conf:

lobj_lock_table, ssl, ssl_key, ssl_cert, ssl_ca_cert, ssl_ca_cert_dir

4 files changed, 119 insertions, 2 deletions

diff --git a/definePgpoolConfParam.php b/definePgpoolConfParam.php
index 02f09c8..f1aeb2f 100644
--- a/definePgpoolConfParam.php
+++ b/definePgpoolConfParam.php
@@ -279,12 +279,12 @@ $pgpoolConfigParam[$key]['regexp'] = ".*";
 $key = 'recovery_1st_stage_command';
 $pgpoolConfigParam[$key]['type'] ='C';
 $pgpoolConfigParam[$key]['default'] ='';
-$pgpoolConfigParam[$key]['regexp'] = "^[0-9a-zA-Z_/\.\-]*$";
+$pgpoolConfigParam[$key]['regexp'] = "^[0-9a-zA-Z_\/\.\-]*$";
 
 $key = 'recovery_2nd_stage_command';
 $pgpoolConfigParam[$key]['type'] ='C';
 $pgpoolConfigParam[$key]['default'] ='';
-$pgpoolConfigParam[$key]['regexp'] = "^[0-9a-zA-Z_/\.\-]*$";
+$pgpoolConfigParam[$key]['regexp'] = "^[0-9a-zA-Z_\/\.\-]*$";
 
 $key = 'recovery_timeout';
 $pgpoolConfigParam[$key]['type'] ='N';
@@ -315,4 +315,33 @@ $pgpoolConfigParam[$key]['default'] =true;
 $key = 'log_per_node_statement';
 $pgpoolConfigParam[$key]['type'] ='B';
 $pgpoolConfigParam[$key]['default'] =false;
+
+$key = 'lobj_lock_table';
+$pgpoolConfigParam[$key]['type'] ='C';
+$pgpoolConfigParam[$key]['default'] ='';
+$pgpoolConfigParam[$key]['regexp'] = ".*";
+
+$key = 'ssl';
+$pgpoolConfigParam[$key]['type'] ='B';
+$pgpoolConfigParam[$key]['default'] = false;
+
+$key = 'ssl_key';
+$pgpoolConfigParam[$key]['type'] ='C';
+$pgpoolConfigParam[$key]['default'] ='';
+$pgpoolConfigParam[$key]['regexp'] = "^(|\/[0-9a-zA-Z_\/\.\-]*)$";
+
+$key = 'ssl_cert';
+$pgpoolConfigParam[$key]['type'] ='C';
+$pgpoolConfigParam[$key]['default'] ='';
+$pgpoolConfigParam[$key]['regexp'] = "^(|\/[0-9a-zA-Z_\/\.\-]*)$";
+
+$key = 'ssl_ca_cert';
+$pgpoolConfigParam[$key]['type'] ='C';
+$pgpoolConfigParam[$key]['default'] ='';
+$pgpoolConfigParam[$key]['regexp'] = "^(|\/[0-9a-zA-Z_\/\.\-]*)$";
+
+$key = 'ssl_ca_cert_dir';
+$pgpoolConfigParam[$key]['type'] ='C';
+$pgpoolConfigParam[$key]['default'] ='';
+$pgpoolConfigParam[$key]['regexp'] = "^(|\/[0-9a-zA-Z_\/\.\-]*)$";
 ?>
diff --git a/lang/en.lang.php b/lang/en.lang.php
index aea3126..0a8bf1a 100644
--- a/lang/en.lang.php
+++ b/lang/en.lang.php
@@ -50,6 +50,7 @@ $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',
+    'descLobj_lock_table' => 'Specifies table name lock used when rewriting lo_create in replication mode',
 	'descLog_connections' => 'If true, incoming connections will be printed to the log',
 	'descLog_hostname' => 'If true, client\'s hostname will be shown in ps status and in a connection log if log_connections is true',
     'descLog_statement' => 'If true, print all statements to the log',
@@ -77,6 +78,11 @@ $message = array(
     'descReplication_timeout' => 'In non strict replication mode, there will be a risk of deadlock',
     'descReset_query_list' => 'Semicolon separated SQL commands to be issued at the end of session',
     'descSocket_dir' => 'The socket directory pgpool could connect',
+    'descSsl' => 'The frontend connection',
+    'descSsl_ca_cert' => 'Path to the SSL private key file',
+    'descSsl_ca_cert_dir' => 'Path to the SSL public certificate file',
+    'descSsl_cert' => 'Path to the SSL private key file',
+    'descSsl_key' => 'Path to the SSL private key file',
     'descSystem_db_dbname' => 'The database name of system database',
     'descSystem_db_hostname' => 'The server name system database running on',
     'descSystem_db_password' => 'The password of system database who connects system database',
diff --git a/lang/ja.lang.php b/lang/ja.lang.php
index a632184..ad3a3a9 100644
--- a/lang/ja.lang.php
+++ b/lang/ja.lang.php
@@ -49,6 +49,7 @@ $message = array(
     'descInsert_lock' => 'INSERT時に自動的にトランザクションの開始，テーブルロック，トランザクションの終了',
     'descListen_addresses' => 'TCP/IPコネクションを受け付けるアドレス',
     'descLoad_balance_mode' => 'レプリケーションモード時にSELECT文を各ノードにロードバランス',
+    'descLobj_lock_table' => 'ラージオブジェクトのレプリケーションでロック管理に使うためのテーブル名',
 	'descLog_connections' => '受信した接続のログを出力',
 	'descLog_hostname' => 'クライアントのホスト名を"ps"ステータスに出力',
     'descLog_statement' => 'SQL文をログ出力',
@@ -76,6 +77,11 @@ $message = array(
 	'descReplicate_select' => 'SELECT 文のレプリケーション',
     'descReplication_timeout' => 'デッドロックを監視するためのタイムアウト時間',
     'descReset_query_list' => 'セッションが終了するときにコネクションを初期化するためのSQLコマンド',
+    'descSsl' => 'pgpool-IIとバックエンドの間のSSL接続',
+    'descSsl_ca_cert' => 'opensslの-CAFileに指定するパス',
+    'descSsl_ca_cert_dir' => 'opensslの-CApathに指定するディレクトリパス',
+    'descSsl_cert' => 'フロントエンドとの接続に使用する公開x509証明書のフルパス',
+    'descSsl_key' => 'フロントエンドとの接続に使用するプライベートキーファイルのフルパス',
     'descSocket_dir' => 'pgpoolがコネクションを受け付けるUnix domain socketディレクトリ',
     'descSystem_db_dbname' => 'System DBのデータベース名',
     'descSystem_db_hostname' => 'System DBが動いているホスト名',
diff --git a/templates/pgconfig.tpl b/templates/pgconfig.tpl
index 9344f0b..8e5ce94 100644
--- a/templates/pgconfig.tpl
+++ b/templates/pgconfig.tpl
@@ -74,6 +74,7 @@ function cancelNode() {
       <li><a href="#health-check">Health Check</a></li>
       <li><a href="#recovery">Online Recovery</a></li>
       <li><a href="#system-database">System Database</a></li>
+      <li><a href="#ssl">Ssl</a></li>
       <li><a href="#others">Others</a></li>
     </ul>
   </div>
@@ -720,6 +721,72 @@ function cancelNode() {
         </tr>
       </tbody>
     </table>
+    <h3><a name="ssl" id="ssl">Ssl</a></h3>
+    <table>
+      <thead>
+        <tr>
+          <th>{$message.strParameter|escape}</th>
+          <th>{$message.strValue|escape}</th>
+        </tr>
+      </thead>
+      <tfoot>
+        <tr>
+          <td colspan="2"></td>
+        </tr>
+      </tfoot>
+      <tbody>
+        <tr> {if $error.ssl != null}
+          <th class="error"><label>{$message.descSsl|escape}</label>
+                    <br />ssl</th>
+          {else}
+          <th><label>{$message.descSsl|escape}</label>
+                    <br />ssl</th>
+          {/if}
+          {if $params.ssl == 'true'}
+          <td><input type="checkbox" name="ssl" id="ssl" value="true" checked="checked" /></td>
+          {else}
+          <td><input type="checkbox" name="ssl" id="ssl" value="false" /></td>
+          {/if} </tr>
+        </tr>
+        <tr> {if $error.ssl_key != null}
+          <th class="error"><label>{$message.descSsl_key|escape}</label>
+                    <br />ssl_key</th>
+          {else}
+          <th><label>{$message.descSsl_key|escape}</label>
+                    <br />ssl_key</th>
+          {/if}
+          <td><input type="text" name="ssl_key" id="ssl_key" value="{$params.ssl_key|escape}" /></td>
+        </tr>
+        <tr> {if $error.ssl_cert != null}
+          <th class="error"><label>{$message.descSsl_cert|escape}</label>
+                    <br />ssl_cert</th>
+          {else}
+          <th><label>{$message.descSsl_cert|escape}</label>
+                    <br />ssl_cert</th>
+          {/if}
+          <td><input type="text" name="ssl_cert" id="ssl_cert" value="{$params.ssl_cert|escape}" /></td>
+        </tr>
+        <tr> {if $error.ssl_ca_cert != null}
+          <th class="error"><label>{$message.descSsl_ca_cert|escape}</label>
+                    <br />ssl_ca_cert</th>
+          {else}
+          <th><label>{$message.descSsl_ca_cert|escape}</label>
+                    <br />ssl_ca_cert</th>
+          {/if}
+          <td><input type="text" name="ssl_ca_cert" id="ssl_ca_cert" value="{$params.ssl_ca_cert|escape}" /></td>
+        </tr>
+        <tr> {if $error.ssl_ca_cert_dir != null}
+          <th class="error"><label>{$message.descSsl_ca_cert_dir|escape}</label>
+                    <br />ssl_ca_cert_dir</th>
+          {else}
+          <th><label>{$message.descSsl_ca_cert_dir|escape}</label>
+                    <br />ssl_ca_cert_dir</th>
+          {/if}
+          <td><input type="text" name="ssl_ca_cert_dir" id="ssl_ca_cert_dir" value="{$params.ssl_ca_cert_dir|escape}" /></td>
+        </tr>
+      </tbody>
+    </table>
+
     <h3><a name="others" id="others">Others</a></h3>
     <table>
       <thead>
@@ -836,6 +903,15 @@ function cancelNode() {
           {/if}
           <td><input type="text" name="failback_command" value="{$params.failback_command|escape}"/></td>
         </tr>
+        <tr> {if $error.lobj_lock_table != null}
+          <th class="error"><label>{$message.descLobj_lock_table|escape}</label>
+                    <br />lobj_lock_table</th>
+          {else}
+          <th><label>{$message.descLobj_lock_table|escape}</label>
+                    <br />lobj_lock_table</th>
+          {/if}
+          <td><input type="text" name="lobj_lock_table" id="lobj_lock_table" value="{$params.lobj_lock_table|escape}" /></td>
+        </tr>
 
       </tbody>
     </table>