Add "slony mode" to pgpool_setup.

diff --git a/doc.ja/src/sgml/ref/pgpool_setup.sgml b/doc.ja/src/sgml/ref/pgpool_setup.sgml
index 9a3878b52c77920ced0cca98567af0098739544c..05628be251de57dd3d6bc7ca809d7732df1d4a48 100644 (file)
--- a/doc.ja/src/sgml/ref/pgpool_setup.sgml
+++ b/doc.ja/src/sgml/ref/pgpool_setup.sgml
@@ -91,12 +91,12 @@ Pgpool-II documentation
        <!--
         Specifies the running mode.  <replaceable>mode</replaceable>
         can be <literal>r</literal> (native replication mode), <literal>s</literal> (streaming replication mode),
-        <literal>n</literal> (raw mode) or <literal>l</literal>
-       (logical replication mode).  If this is
+        <literal>n</literal> (raw mode), <literal>l</literal>
+       (logical replication mode) or <literal>y</literal> (slony mode).  If this is
        omitted, <literal>s</literal> is assumed.
         -->
         動作モードを指定します。<replaceable>mode</replaceable>は
-        <literal>r</literal> (ネイティブレプリケーションモード), <literal>s</literal> (ストリーミングレプリケーションモード)、<literal>n</literal> (raw モード)、または<literal>l</literal> (ロジカルレプリケーションモード)を指定できます。
+        <literal>r</literal> (ネイティブレプリケーションモード), <literal>s</literal> (ストリーミングレプリケーションモード)、<literal>n</literal> (raw モード)、<literal>l</literal> (ロジカルレプリケーションモード)または<literal>l</literal>（slonyモード）を指定できます。
         指定しない場合は、<literal>s</literal> (ストリーミングレプリケーションモード) を指定した見なされます。
        </para>
       </listitem>

diff --git a/doc/src/Makefile.in b/doc/src/Makefile.in
index ab3fe3d6af8fab2b9e9bc9a286350015d2ad920e..26e04bc43e81b39e619b0c6c52afc3fd61108610 100644 (file)
--- a/doc/src/Makefile.in
+++ b/doc/src/Makefile.in
@@ -110,11 +110,11 @@ am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 =
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
-am__v_at_1 =
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \

diff --git a/doc/src/sgml/ref/pgpool_setup.sgml b/doc/src/sgml/ref/pgpool_setup.sgml
index 952545b6bbcc867471c6b8a267db69d6e667db3a..eb6eddf2120cf74d890db6fafc4070ed2958e19d 100644 (file)
--- a/doc/src/sgml/ref/pgpool_setup.sgml
+++ b/doc/src/sgml/ref/pgpool_setup.sgml
@@ -65,8 +65,8 @@ Pgpool-II documentation
        <para>
         Specifies the running mode.  <replaceable>mode</replaceable>
         can be <literal>r</literal> (native replication mode), <literal>s</literal> (streaming replication mode),
-        <literal>n</literal> (raw mode) or <literal>l</literal>
-       (logical replication mode).  If this is
+        <literal>n</literal> (raw mode), <literal>l</literal>
+       (logical replication mode) or <literal>y</literal> (slony mode).  If this is
        omitted, <literal>s</literal> is assumed.
        </para>
       </listitem>

diff --git a/src/test/pgpool_setup b/src/test/pgpool_setup
index 8f11cae0a88b13507b3950fc765e2fe9f5c2a04b..6ce80632f055ca19bc75586a06d9e5d5c40776bd 100755 (executable)
--- a/src/test/pgpool_setup
+++ b/src/test/pgpool_setup
@@ -23,6 +23,7 @@
 # -m r: create an installation as native replication mode.
 # -m n: create an installation as raw mode.
 # -m l: create an installation as logical replication mode.
+# -m y: create an installation as slony mode.
 # -n num_clusters: create num_clusters PostgreSQL database cluster nodes
 # -p base_port: specify base port. pgpool port is base_port.
 #  pcp port is base_port + 1. The first PostgreSQL node's port is
@@ -292,7 +293,7 @@ function set_postgresql_conf
                echo "max_wal_senders = $NUMCLUSTERS" >> $PGCONF
                echo "archive_mode = on" >> $PGCONF
                echo "archive_command = 'cp %p $BASEDIR/archivedir/%f </dev/null'" >> $PGCONF
-       elif [ $MODE = 'r' -o $MODE = 'l' ];then
+       elif [ $MODE = 'r' -o $MODE = 'l' -o $MODE = 'y' ];then
                echo "wal_level = archive" >> $PGCONF
                echo "archive_mode = on" >> $PGCONF
                echo "archive_command = 'cp %p $BASEDIR/archivedir/%f </dev/null'" >> $PGCONF
@@ -562,7 +563,7 @@ function wait_for_pgpool_reload {
 ################################################################################
 function usage()
 {
-       echo "usage: $0 [-m r|s|n|l] [-n num_clusters] [-p base_port] [-pg pg_base_port][--no-stop] [-d]";exit 1
+       echo "usage: $0 [-m r|s|n|l|y] [-n num_clusters] [-p base_port] [-pg pg_base_port][--no-stop] [-d]";exit 1
 }
 
 #-------------------------------------------
@@ -583,6 +584,7 @@ do
                        s ) MODE="s";;
                        n ) MODE="n";;
                        l ) MODE="l";;
+                       y ) MODE="y";;
                        * ) usage;;
                esac
        elif [ $1 = "-n" ];then
@@ -623,6 +625,9 @@ case $MODE in
        l ) MODENAME="logical replication mode"
            SAMPLE_CONF=$PGPOOLDIR/pgpool.conf.sample-logical
            ;;
+       y ) MODENAME="slony mode"
+           SAMPLE_CONF=$PGPOOLDIR/pgpool.conf.sample-master-slave
+           ;;
 esac
 
 #-------------------------------------------
@@ -836,7 +841,7 @@ else
 
        while [ $n -lt $NUMCLUSTERS ]
        do
-           if [ $MODE = 'l' ]
+           if [ $MODE = 'l' -o $MODE = 'y' ]
            then
                # temporarily start data$n cluster to create extensions
                echo "temporarily start data${n} cluster to create extensions"