FIX: remove db_max_wal_senders and db_wal_level entirely

* I had previously removed the db_wal_level and db_max_wal_senders but
  foolishly assumed there was some sort of default or they would only get
  replaced if defined

diff --git a/templates/postgres.10.template.yml b/templates/postgres.10.template.yml
index c60350ca3312ae23bb32f02e37f93a1fb8a8b29c..dead6295211ffb3c53024a213e93ed1fa0a83f9f 100644 (file)
--- a/templates/postgres.10.template.yml
+++ b/templates/postgres.10.template.yml
@@ -92,16 +92,6 @@ run:
       cmd:
         - install -d -m 0755 -o postgres -g postgres /shared/postgres_backup
 
-  - replace:
-      filename: "/etc/postgresql/10/main/postgresql.conf"
-      from: /#?max_wal_senders *=.*/
-      to: "max_wal_senders = $db_max_wal_senders"
-
-  - replace:
-      filename: "/etc/postgresql/10/main/postgresql.conf"
-      from: /#?wal_level *=.*/
-      to: "wal_level = $db_wal_level"
-
   - replace:
       filename: "/etc/postgresql/10/main/postgresql.conf"
       from: /#?checkpoint_segments *=.*/

diff --git a/templates/postgres.12.template.yml b/templates/postgres.12.template.yml
index b4b76f5e11f79c75a86fc8c67a654d4cef16a499..7a29faaa09cfacd44520bfc47ecaf02be57fa16d 100644 (file)
--- a/templates/postgres.12.template.yml
+++ b/templates/postgres.12.template.yml
@@ -89,16 +89,6 @@ run:
       cmd:
         - install -d -m 0755 -o postgres -g postgres /shared/postgres_backup
 
-  - replace:
-      filename: "/etc/postgresql/12/main/postgresql.conf"
-      from: /#?max_wal_senders *=.*/
-      to: "max_wal_senders = $db_max_wal_senders"
-
-  - replace:
-      filename: "/etc/postgresql/12/main/postgresql.conf"
-      from: /#?wal_level *=.*/
-      to: "wal_level = $db_wal_level"
-
   - replace:
       filename: "/etc/postgresql/12/main/postgresql.conf"
       from: /#?checkpoint_segments *=.*/

diff --git a/templates/postgres.9.5.template.yml b/templates/postgres.9.5.template.yml
index 90750017b6e04488811c42530f811d3659318bff..febcc2fabe95ad19f5874f53651518ab08073571 100644 (file)
--- a/templates/postgres.9.5.template.yml
+++ b/templates/postgres.9.5.template.yml
@@ -5,8 +5,6 @@ params:
   db_default_text_search_config: "pg_catalog.english"
   db_name: discourse
   db_user: discourse
-  db_wal_level: minimal
-  db_max_wal_senders: 0
   db_checkpoint_segments: 6
   db_logging_collector: off
   db_log_min_duration_statement: 100
@@ -94,16 +92,6 @@ run:
       cmd:
         - install -d -m 0755 -o postgres -g postgres /shared/postgres_backup
 
-  - replace:
-      filename: "/etc/postgresql/9.5/main/postgresql.conf"
-      from: /#?max_wal_senders *=.*/
-      to: "max_wal_senders = $db_max_wal_senders"
-
-  - replace:
-      filename: "/etc/postgresql/9.5/main/postgresql.conf"
-      from: /#?wal_level *=.*/
-      to: "wal_level = $db_wal_level"
-
   - replace:
       filename: "/etc/postgresql/9.5/main/postgresql.conf"
       from: /#?checkpoint_segments *=.*/

diff --git a/templates/postgres.template.yml b/templates/postgres.template.yml
index afccf3fd78099fb7abd27ff14bf0ace16fab229c..2ccecde6df7fd057b51cdbd7e77714d370faf09b 100644 (file)
--- a/templates/postgres.template.yml
+++ b/templates/postgres.template.yml
@@ -166,16 +166,6 @@ run:
       cmd:
         - install -d -m 0755 -o postgres -g postgres /shared/postgres_backup
 
-  - replace:
-      filename: "/etc/postgresql/12/main/postgresql.conf"
-      from: /#?max_wal_senders *=.*/
-      to: "max_wal_senders = $db_max_wal_senders"
-
-  - replace:
-      filename: "/etc/postgresql/12/main/postgresql.conf"
-      from: /#?wal_level *=.*/
-      to: "wal_level = $db_wal_level"
-
   - replace:
       filename: "/etc/postgresql/12/main/postgresql.conf"
       from: /#?checkpoint_segments *=.*/