Allow failover.sh, follow_master.sh, recovery_1st_stage, recovery_2nd_stage,

pgpool_remote_start scripts to be included in distributions.

diff --git a/doc.ja/src/sgml/release-4.1.sgml b/doc.ja/src/sgml/release-4.1.sgml
index 155dd4148e12241b6ce9c8509052219f1dc8b387..5f860cfc916beff9d0690d106ec99df1373082c9 100644 (file)
--- a/doc.ja/src/sgml/release-4.1.sgml
+++ b/doc.ja/src/sgml/release-4.1.sgml
@@ -935,6 +935,26 @@
     </para>
    </listitem>
 
+   <listitem>
+    <!--
+    2019-09-04 [0afbf1d6]
+    -->
+    <para>
+<!--
+     Add various sample scripts. (Bo Peng)
+-->
+     フェイルオーバ、オンライリカバリで実行される各種サンプルスクリプトを追加しました。(Bo Peng)
+    </para>
+    <para>
+<!--
+     Allow failover.sh, follow_master.sh, recovery_1st_stage, recovery_2nd_stage,
+     pgpool_remote_start scripts to be included in distributions.
+-->
+     failover.sh、follow_master.sh、recovery_1st_stage、recovery_2nd_stage、
+     pgpool_remote_startのサンプルスクリプトを配布別に含めるようにします。
+    </para>
+   </listitem>
+
    <listitem>
     <!--
     2019-01-27 [f03ebdba]

diff --git a/doc/src/sgml/release-4.1.sgml b/doc/src/sgml/release-4.1.sgml
index 313533062b5a4d7c945d965e1a106ea1d9505173..419d656b5b06342dc181f59bb6394273c3d34da4 100644 (file)
--- a/doc/src/sgml/release-4.1.sgml
+++ b/doc/src/sgml/release-4.1.sgml
@@ -675,6 +675,19 @@
     </para>
    </listitem>
 
+   <listitem>
+    <!--
+    2019-09-04 [0afbf1d6]
+    -->
+    <para>
+     Add various sample scripts. (Bo Peng)
+    </para>
+    <para>
+     Allow failover.sh, follow_master.sh, recovery_1st_stage, recovery_2nd_stage,
+     pgpool_remote_start scripts to be included in distributions.
+    </para>
+   </listitem>
+
    <listitem>
     <!--
     2019-01-27 [f03ebdba]

diff --git a/src/Makefile.am b/src/Makefile.am
index 7eb11db418e86e322315e819cc266548beec22e0..b701bf0e4e0c7bcbd7a197507701d06e8ee73570 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -70,7 +70,13 @@ sysconf_DATA = sample/pgpool.conf.sample \
                           sample/pgpool.conf.sample-replication \
                           sample/pgpool.conf.sample-master-slave \
                           sample/pgpool.conf.sample-stream \
-                          sample/pgpool.conf.sample-logical
+                          sample/pgpool.conf.sample-logical \
+                          sample/scripts/failover.sh.sample \
+                          sample/scripts/follow_master.sh.sample \
+                          sample/scripts/pgpool_remote_start.sample \
+                          sample/scripts/recovery_1st_stage.sample \
+                          sample/scripts/recovery_2nd_stage.sample
+
 
 pkgdata_DATA = sql/insert_lock.sql \
                           sample/pgpool.pam
@@ -91,7 +97,11 @@ endif
 AM_YFLAGS = -d
 
 EXTRA_DIST = sample/pgpool.pam \
-               sample/pgpool_remote_start sample/pgpool_recovery sample/pgpool_recovery_pitr \
+               sample/scripts/failover.sh.sample \
+               sample/scripts/follow_master.sh.sample \
+               sample/scripts/pgpool_remote_start.sample \
+               sample/scripts/recovery_1st_stage.sample \
+               sample/scripts/recovery_2nd_stage.sample \
                sample/pgpool.conf.sample sample/pool_hba.conf.sample \
                sample/pgpool.conf.sample-replication sample/pgpool.conf.sample-master-slave \
                sample/pgpool.conf.sample-stream sample/pgpool.conf.sample-logical sample/pcp.conf.sample \

diff --git a/src/Makefile.in b/src/Makefile.in
index 8f3635d782d7311e47e946dbec1e163f508ff8ca..efc770f102a624fcc59b5511b924b2fe9da9842e 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -491,7 +491,12 @@ sysconf_DATA = sample/pgpool.conf.sample \
                           sample/pgpool.conf.sample-replication \
                           sample/pgpool.conf.sample-master-slave \
                           sample/pgpool.conf.sample-stream \
-                          sample/pgpool.conf.sample-logical
+                          sample/pgpool.conf.sample-logical \
+                          sample/scripts/failover.sh.sample \
+                          sample/scripts/follow_master.sh.sample \
+                          sample/scripts/pgpool_remote_start.sample \
+                          sample/scripts/recovery_1st_stage.sample \
+                          sample/scripts/recovery_2nd_stage.sample
 
 pkgdata_DATA = sql/insert_lock.sql \
                           sample/pgpool.pam
@@ -508,7 +513,11 @@ pgpool_LDADD = -L@PGSQL_LIB_DIR@ -lpq parser/libsql-parser.a \
 @enable_rpath_TRUE@pgpool_LDFLAGS = -rpath @PGSQL_LIB_DIR@ -rpath $(libdir)
 AM_YFLAGS = -d
 EXTRA_DIST = sample/pgpool.pam \
-               sample/pgpool_remote_start sample/pgpool_recovery sample/pgpool_recovery_pitr \
+               sample/scripts/failover.sh.sample \
+               sample/scripts/follow_master.sh.sample \
+               sample/scripts/pgpool_remote_start.sample \
+               sample/scripts/recovery_1st_stage.sample \
+               sample/scripts/recovery_2nd_stage.sample \
                sample/pgpool.conf.sample sample/pool_hba.conf.sample \
                sample/pgpool.conf.sample-replication sample/pgpool.conf.sample-master-slave \
                sample/pgpool.conf.sample-stream sample/pgpool.conf.sample-logical sample/pcp.conf.sample \

diff --git a/src/pgpool.spec b/src/pgpool.spec
index 5dade9d3fb1cf12043997b295ea6b477762e5cb5..268841941e92fc32cc635dc782a8b35488195c5b 100644 (file)
--- a/src/pgpool.spec
+++ b/src/pgpool.spec
@@ -236,6 +236,11 @@ fi
 %{_sysconfdir}/%{short_name}/pgpool.conf.sample-replication
 %{_sysconfdir}/%{short_name}/pgpool.conf.sample-stream
 %{_sysconfdir}/%{short_name}/pgpool.conf.sample-logical
+%{_sysconfdir}/%{short_name}/failover.sh.sample
+%{_sysconfdir}/%{short_name}/follow_master.sh.sample
+%{_sysconfdir}/%{short_name}/pgpool_remote_start.sample
+%{_sysconfdir}/%{short_name}/recovery_1st_stage.sample
+%{_sysconfdir}/%{short_name}/recovery_2nd_stage.sample
 %{_libdir}/libpcp.so.*
 %if %{systemd_enabled}
 %ghost %{_varrundir}

diff --git a/src/sample/scripts/failover.sh b/src/sample/scripts/failover.sh.sample
similarity index 100%
rename from src/sample/scripts/failover.sh
rename to src/sample/scripts/failover.sh.sample

diff --git a/src/sample/scripts/follow_master.sh b/src/sample/scripts/follow_master.sh.sample
similarity index 100%
rename from src/sample/scripts/follow_master.sh
rename to src/sample/scripts/follow_master.sh.sample

diff --git a/src/sample/scripts/pgpool_remote_start b/src/sample/scripts/pgpool_remote_start.sample
similarity index 100%
rename from src/sample/scripts/pgpool_remote_start
rename to src/sample/scripts/pgpool_remote_start.sample

diff --git a/src/sample/scripts/recovery_1st_stage b/src/sample/scripts/recovery_1st_stage.sample
similarity index 100%
rename from src/sample/scripts/recovery_1st_stage
rename to src/sample/scripts/recovery_1st_stage.sample

diff --git a/src/sample/scripts/recovery_2nd_stage b/src/sample/scripts/recovery_2nd_stage.sample
similarity index 100%
rename from src/sample/scripts/recovery_2nd_stage
rename to src/sample/scripts/recovery_2nd_stage.sample