Remove some unnecessary settings from sample config files.

diff --git a/src/sample/pgpool.conf.sample-logical b/src/sample/pgpool.conf.sample-logical
index a771366757766495f59f3e7f0c072773e3a61929..a81fdb01b3dbaf6c90cf78b61ae9889829025c72 100644 (file)
--- a/src/sample/pgpool.conf.sample-logical
+++ b/src/sample/pgpool.conf.sample-logical
@@ -22,6 +22,7 @@
 # Choose one of: 'streaming_replication', 'native_replication',
 #      'logical_replication', 'slony', 'raw' or 'snapshot_isolation'
 #------------------------------------------------------------------------------
+
 backend_clustering_mode = 'logical_replication'
 
 #------------------------------------------------------------------------------
@@ -314,9 +315,6 @@ reset_query_list = 'ABORT; DISCARD ALL'
 # REPLICATION MODE
 #------------------------------------------------------------------------------
 
-replication_mode = off
-                                   # Activate replication mode
-                                   # (change requires restart)
 replicate_select = off
                                    # Replicate SELECT statements
                                    # when in replication mode

diff --git a/src/sample/pgpool.conf.sample-raw b/src/sample/pgpool.conf.sample-raw
index 36d04509b31c8ca8bcfab5253d0794c140aa58b5..023984f61b416bfc3986ba812d33d2af5bdfb766 100644 (file)
--- a/src/sample/pgpool.conf.sample-raw
+++ b/src/sample/pgpool.conf.sample-raw
@@ -23,6 +23,7 @@
 #      'logical_replication', 'slony', 'raw' or 'snapshot_isolation'
 # (change requires restart)
 #------------------------------------------------------------------------------
+
 backend_clustering_mode = 'raw'
 
 #------------------------------------------------------------------------------
@@ -433,6 +434,10 @@ dml_adaptive_object_relationship_list= ''
 statement_level_load_balance = off
                                    # Enables statement level load balancing
 
+#------------------------------------------------------------------------------
+# MASTER/SLAVE MODE
+#------------------------------------------------------------------------------
+
 # - Streaming -
 
 sr_check_period = 10

diff --git a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
index dcae99d949aadcab83ae157e59bf4fd7d14a9f35..7338f92b9f1e69b549423eef0c6b25957a38f185 100644 (file)
--- a/src/sample/pgpool.conf.sample-replication
+++ b/src/sample/pgpool.conf.sample-replication
@@ -23,6 +23,7 @@
 #      'logical_replication', 'slony', 'raw' or 'snapshot_isolation'
 # (change requires restart)
 #------------------------------------------------------------------------------
+
 backend_clustering_mode = 'native_replication'
 
 #------------------------------------------------------------------------------
@@ -432,15 +433,6 @@ statement_level_load_balance = off
 # MASTER/SLAVE MODE
 #------------------------------------------------------------------------------
 
-master_slave_mode = off
-                                   # Activate master/slave mode
-                                   # (change requires restart)
-master_slave_sub_mode = 'stream'
-                                   # Master/slave sub mode
-                                   # Valid values are combinations stream, slony
-                                   # or logical. Default is stream.
-                                   # (change requires restart)
-
 # - Streaming -
 
 sr_check_period = 0

diff --git a/src/sample/pgpool.conf.sample-slony b/src/sample/pgpool.conf.sample-slony
index 3a78e6504c5c28276f278e5e04141d156a45fd35..f1bef59a0b7deed3a9c929e14271630e7870c819 100644 (file)
--- a/src/sample/pgpool.conf.sample-slony
+++ b/src/sample/pgpool.conf.sample-slony
@@ -23,6 +23,7 @@
 #      'logical_replication', 'slony', 'raw' or 'snapshot_isolation'
 # (change requires restart)
 #------------------------------------------------------------------------------
+
 backend_clustering_mode = 'slony'
 
 #------------------------------------------------------------------------------
@@ -311,9 +312,6 @@ reset_query_list = 'ABORT; DISCARD ALL'
 # REPLICATION MODE
 #------------------------------------------------------------------------------
 
-replication_mode = off
-                                   # Activate replication mode
-                                   # (change requires restart)
 replicate_select = off
                                    # Replicate SELECT statements
                                    # when in replication mode
@@ -432,6 +430,10 @@ dml_adaptive_object_relationship_list= ''
 statement_level_load_balance = off
                                    # Enables statement level load balancing
 
+#------------------------------------------------------------------------------
+# MASTER/SLAVE MODE
+#------------------------------------------------------------------------------
+
 # - Streaming -
 
 sr_check_period = 0

diff --git a/src/sample/pgpool.conf.sample-snapshot b/src/sample/pgpool.conf.sample-snapshot
index d55cc32b463ff8286ba05493962af84bf68cf2cf..16a12d106ab6e6776fe596f9c53cdda2893df142 100644 (file)
--- a/src/sample/pgpool.conf.sample-snapshot
+++ b/src/sample/pgpool.conf.sample-snapshot
@@ -23,6 +23,7 @@
 #      'logical_replication', 'slony', 'raw' or 'snapshot_isolation'
 # (change requires restart)
 #------------------------------------------------------------------------------
+
 backend_clustering_mode = 'snapshot_isolation'
 
 #------------------------------------------------------------------------------
@@ -432,15 +433,6 @@ statement_level_load_balance = off
 # MASTER/SLAVE MODE
 #------------------------------------------------------------------------------
 
-master_slave_mode = off
-                                   # Activate master/slave mode
-                                   # (change requires restart)
-master_slave_sub_mode = 'stream'
-                                   # Master/slave sub mode
-                                   # Valid values are combinations stream, slony
-                                   # or logical. Default is stream.
-                                   # (change requires restart)
-
 # - Streaming -
 
 sr_check_period = 0

diff --git a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
index 8f59d03b587c4da48eeb603bd574693b66e09802..921fa6c10eaf7d1f7d21dd184d8b3b05ab2945f7 100644 (file)
--- a/src/sample/pgpool.conf.sample-stream
+++ b/src/sample/pgpool.conf.sample-stream
@@ -23,6 +23,7 @@
 #      'logical_replication', 'slony', 'raw' or 'snapshot_isolation'
 # (change requires restart)
 #------------------------------------------------------------------------------
+
 backend_clustering_mode = 'streaming_replication'
 
 #------------------------------------------------------------------------------
@@ -314,9 +315,6 @@ reset_query_list = 'ABORT; DISCARD ALL'
 # REPLICATION MODE
 #------------------------------------------------------------------------------
 
-replication_mode = off
-                                   # Activate replication mode
-                                   # (change requires restart)
 replicate_select = off
                                    # Replicate SELECT statements
                                    # when in replication mode
@@ -435,6 +433,10 @@ dml_adaptive_object_relationship_list= ''
 statement_level_load_balance = off
                                    # Enables statement level load balancing
 
+#------------------------------------------------------------------------------
+# MASTER/SLAVE MODE
+#------------------------------------------------------------------------------
+
 # - Streaming -
 
 sr_check_period = 10