From b85821aca2c3cfc1c732dfcc0c1d6758a263487a Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Tue, 4 May 2021 13:28:59 +0100
Subject: [PATCH] Add port parameter to the sample config for psycopg2 args
 (#9911)

Adds the `port` option with the default value to the sample config file.
---
 changelog.d/9911.doc       | 1 +
 docs/sample_config.yaml    | 1 +
 synapse/config/database.py | 1 +
 3 files changed, 3 insertions(+)
 create mode 100644 changelog.d/9911.doc

diff --git a/changelog.d/9911.doc b/changelog.d/9911.doc
new file mode 100644
index 0000000000..f7fd9f1ba9
--- /dev/null
+++ b/changelog.d/9911.doc
@@ -0,0 +1 @@
+Add `port` argument to the Postgres database sample config section.
\ No newline at end of file
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index e0350279ad..d013725cdc 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -810,6 +810,7 @@ caches:
 #    password: secretpassword
 #    database: synapse
 #    host: localhost
+#    port: 5432
 #    cp_min: 5
 #    cp_max: 10
 #
diff --git a/synapse/config/database.py b/synapse/config/database.py
index 79a02706b4..c76ef1e1de 100644
--- a/synapse/config/database.py
+++ b/synapse/config/database.py
@@ -58,6 +58,7 @@ DEFAULT_CONFIG = """\
 #    password: secretpassword
 #    database: synapse
 #    host: localhost
+#    port: 5432
 #    cp_min: 5
 #    cp_max: 10
 #