From: Michael Brown <supermathie@gmail.com>
Date: Wed, 15 Jul 2020 17:29:26 +0000 (-0400)
Subject: FIX: remove db_max_wal_senders and db_wal_level entirely
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4a7fa7ab618aaf8655bf468da4b2bc113ebe30b4;p=discourse_docker.git

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 c60350c..dead629 100644
--- 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 b4b76f5..7a29faa 100644
--- 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 9075001..febcc2f 100644
--- 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 afccf3f..2ccecde 100644
--- 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 *=.*/