From: Tatsuo Ishii
Date: Fri, 16 May 2014 07:39:38 +0000 (+0900)
Subject: Remove old restriction description which is no longer true.
X-Git-Tag: V3_1_12~22
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=2014a6a421497faea0704f1f7b66200f640583a7;p=pgpool2.git
Remove old restriction description which is no longer true.
Following descriptions are removed ([pgpool-general: 2815].
>> pgpool-II does not support pg_hba.conf-like access controls. If TCP/IP
> connections are enabled, pgpool-II accepts all the connections from any
> host.
>> "hostssl" connection type is not supported
---
diff --git a/doc/pgpool-en.html b/doc/pgpool-en.html
index 840dbda67..1a599203e 100644
--- a/doc/pgpool-en.html
+++ b/doc/pgpool-en.html
@@ -7,7 +7,7 @@
-Last modified: Sat Apr 5 18:24:43 JST 2014
+Last modified: Fri May 16 16:45:36 JST 2014
@@ -2217,11 +2217,14 @@ ELSE 2
Here are the limitations of pool_hba.
+<<<<<<< HEAD
- "hostssl" connection type is not supported
Though "hostssl" is invalid, pgpool-II 2.3 or later supports SSL.
See SSL for more details.
+=======
+>>>>>>> fb819b2... Remove old restriction description which is no longer true.
- "samegroup" for DATABASE field is not supported
Since pgpool does not know anything about users in the backend server,
@@ -3185,6 +3188,7 @@ recovery.
+<<<<<<< HEAD
- In the replication mode or master/slave mode, trust, clear text
password, and pam methods are supported. md5 in also supported since pgpool-II 3.0.
@@ -3218,6 +3222,33 @@ recovery.
pgpool-II connections can use pg_hba.conf, of course).
+=======
+ In the replication mode or master/slave mode, trust, clear text password,
+ and pam methods are supported. md5 in also supported since pgpool-II 3.0.
+ md5 is supported by using a authencitaion file ("pool_passwd").
+ "pool_passwd" is default name of the authentication file.
+ You can change the file name using pool_passwd.
+ Here are the steps to enable md5 authentication:
+
+ - Login as the database's operating system user and type
+ "pg_md5 --md5auth --username= "
+ user name and md5 encrypted password are registered into pool_passwd.
+ If pool_passwd does not exist yet, pg_md5 command will
+ automatically create it for you.
+ - The format of pool_passwd is "username:encrypted_passwd".
+ - You also need to add an appropriate md5 entry to pool_hba.conf.
+ See Setting up pool_hba.conf for client authentication (HBA)
+ for more details.
+ - Please note that the user name and password must be
+ identical to those registered in PostgreSQL.
+ - After changing md5 password(in both pool_passwd and PostgreSQL of course),
+ you need to execute "pgpool reload" or restart pgpool(if your pgpool is 3.1 or before).
+
+
+ In all the other modes, trust, clear text password, crypt, md5,
+ and pam methods are supported.
+
+>>>>>>> fb819b2... Remove old restriction description which is no longer true.
Large objects
diff --git a/doc/pgpool-ja.html b/doc/pgpool-ja.html
index de81ce4e1..be07df91a 100644
--- a/doc/pgpool-ja.html
+++ b/doc/pgpool-ja.html
@@ -8,7 +8,7 @@
-Last modified: Sat Apr 5 18:19:36 JST 2014
+Last modified: Fri May 16 16:45:48 JST 2014
@@ -2154,11 +2154,21 @@ CREATE OR REPLACE FUNCTION pgpool_catalog.dist_def_accounts (val ANYELEMENT) RET
以ä¸ã¯pool_hbaã®å¶éäºé
ã§ãã
+<<<<<<< HEAD
- "hostssl"æ¥ç¶ã¿ã¤ãã¯ãµãã¼ãããã¾ãã
pool_hba.confã«"hostssl"ã¯æå®ãããã¨ã¯ã§ãã¾ããããpgpool-IIã¯2.3以éã§SSLããµãã¼ããã¦ãã¾ãã
詳細ã¯SSLãåç
§ãã¦ãã ããã
+=======
+ - DATABASEãã£ã¼ã«ãå¤ã¨ãã¦"samegroup"ã¯ãµãã¼ãããã¾ãã
+
+ pgpoolã¯ããã¯ã¨ã³ããµã¼ãã«ããã¦ã¼ã¶æ
å ±ãäºåã«ç¥ãäºãã§ããªãããã
+ ãã¼ã¿ãã¼ã¹åã¯pool_hba.confã«ããå¤ã®ã¿ã¨æ¯è¼ããã¾ãã
+ ãªã®ã§ã°ã«ã¼ãã«é¢ããèªè¨¼ã¯pool_hbaã§è¡ããã¨ãã§ãã¾ããã
+
+
+>>>>>>> fb819b2... Remove old restriction description which is no longer true.
- DATABASEãã£ã¼ã«ãå¤ã¨ãã¦"samegroup"ã¯ãµãã¼ãããã¾ãã