From 643af2d344870e107944cb3f82a48a09d6026dd9 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 7 Aug 2018 18:28:18 +0200
Subject: [PATCH] run synapse on custom port so it doesn't interfere with other
 synapses on dev machines

---
 riot/config-template/config.json                 | 6 +++---
 synapse/config-templates/consent/homeserver.yaml | 6 +++---
 synapse/install.sh                               | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/riot/config-template/config.json b/riot/config-template/config.json
index 39bbd6490a..6277e567fc 100644
--- a/riot/config-template/config.json
+++ b/riot/config-template/config.json
@@ -1,5 +1,5 @@
 {
-    "default_hs_url": "http://localhost:8008",
+    "default_hs_url": "http://localhost:5005",
     "default_is_url": "https://vector.im",
     "disable_custom_urls": false,
     "disable_guests": false,
@@ -18,12 +18,12 @@
     "default_theme": "light",
     "roomDirectory": {
         "servers": [
-            "localhost:8008"
+            "localhost:5005"
         ]
     },
     "piwik": {
         "url": "https://piwik.riot.im/",
-        "whitelistedHSUrls": ["http://localhost:8008"],
+        "whitelistedHSUrls": ["http://localhost:5005"],
         "whitelistedISUrls": ["https://vector.im", "https://matrix.org"],
         "siteId": 1
     },
diff --git a/synapse/config-templates/consent/homeserver.yaml b/synapse/config-templates/consent/homeserver.yaml
index a27fbf6f10..38aa4747b5 100644
--- a/synapse/config-templates/consent/homeserver.yaml
+++ b/synapse/config-templates/consent/homeserver.yaml
@@ -86,7 +86,7 @@ web_client: True
 # web_client_location: "/path/to/web/root"
 
 # The public-facing base URL for the client API (not including _matrix/...)
-public_baseurl: http://localhost:8008/
+public_baseurl: http://localhost:{{SYNAPSE_PORT}}/
 
 # Set the soft limit on the number of file descriptors synapse can use
 # Zero is used to indicate synapse should set the soft limit to the
@@ -166,7 +166,7 @@ listeners:
 
   # Unsecure HTTP listener,
   # For when matrix traffic passes through loadbalancer that unwraps TLS.
-  - port: 8008
+  - port: {{SYNAPSE_PORT}}
     tls: false
     bind_addresses: ['::', '0.0.0.0']
     type: http
@@ -693,5 +693,5 @@ user_consent:
 server_notices:
   system_mxid_localpart: notices
   system_mxid_display_name: "Server Notices"
-  system_mxid_avatar_url: "mxc://localhost:8008/oumMVlgDnLYFaPVkExemNVVZ"
+  system_mxid_avatar_url: "mxc://localhost:{{SYNAPSE_PORT}}/oumMVlgDnLYFaPVkExemNVVZ"
   room_name: "Server Notices"
diff --git a/synapse/install.sh b/synapse/install.sh
index dc4a08cb41..2e9b668b5e 100755
--- a/synapse/install.sh
+++ b/synapse/install.sh
@@ -4,7 +4,7 @@ SYNAPSE_BRANCH=master
 INSTALLATION_NAME=consent
 SERVER_DIR=installations/$INSTALLATION_NAME
 CONFIG_TEMPLATE=consent
-PORT=8008
+PORT=5005
 # set current directory to script directory
 BASE_DIR=$(readlink -f $(dirname $0))
 
@@ -33,7 +33,7 @@ python -m synapse.app.homeserver \
 # apply configuration
 cp -r $BASE_DIR/config-templates/$CONFIG_TEMPLATE/. ./
 sed -i "s#{{SYNAPSE_ROOT}}#$(pwd)/#g" homeserver.yaml
-sed -i "s#{{SYNAPSE_PORT}}#${PORT}/#g" homeserver.yaml
+sed -i "s#{{SYNAPSE_PORT}}#${PORT}#g" homeserver.yaml
 sed -i "s#{{FORM_SECRET}}#$(uuidgen)#g" homeserver.yaml
 sed -i "s#{{REGISTRATION_SHARED_SECRET}}#$(uuidgen)#g" homeserver.yaml
 sed -i "s#{{MACAROON_SECRET_KEY}}#$(uuidgen)#g" homeserver.yaml