diff --git a/.circleci/merge_base_branch.sh b/.circleci/merge_base_branch.sh
index b2c8c40f4c4a..4c19fa70d745 100755
--- a/.circleci/merge_base_branch.sh
+++ b/.circleci/merge_base_branch.sh
@@ -20,7 +20,7 @@ else
fi
# Show what we are before
-git show -s
+git --no-pager show -s
# Set up username so it can do a merge
git config --global user.email bot@matrix.org
@@ -31,4 +31,4 @@ git fetch -u origin $GITBASE
git merge --no-edit origin/$GITBASE
# Show what we are after.
-git show -s
+git --no-pager show -s
diff --git a/changelog.d/4289.feature b/changelog.d/4289.feature
new file mode 100644
index 000000000000..4d53bd22c38c
--- /dev/null
+++ b/changelog.d/4289.feature
@@ -0,0 +1 @@
+Add a welcome page for the client API port. Credit to @krombel!
\ No newline at end of file
diff --git a/changelog.d/4291.misc b/changelog.d/4291.misc
new file mode 100644
index 000000000000..d3bfe3dd0c1c
--- /dev/null
+++ b/changelog.d/4291.misc
@@ -0,0 +1 @@
+Disable pager when running git-show in CI
\ No newline at end of file
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 3e4dea2f196a..e433c6655831 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -137,8 +137,11 @@ def _listener_http(self, config, listener_config):
handler = handler_cls(config, module_api)
resources[path] = AdditionalResource(self, handler.handle_request)
+ # try to find something useful to redirect '/' to
if WEB_CLIENT_PREFIX in resources:
root_resource = RootRedirect(WEB_CLIENT_PREFIX)
+ elif STATIC_PREFIX in resources:
+ root_resource = RootRedirect(STATIC_PREFIX)
else:
root_resource = NoResource()
diff --git a/synapse/static/index.html b/synapse/static/index.html
new file mode 100644
index 000000000000..d6642399837d
--- /dev/null
+++ b/synapse/static/index.html
@@ -0,0 +1,26 @@
+
+
+ Synapse is running
+
+
+
+ Synapse is running
+ Congratulations!
+ Your Synapse server is listening on this port and is ready for messages.
+ To use this server you'll need a client - e.g. one of
+ this list of Matrix clients.
+ You can find (federated) rooms that might be of interest to you on
+ view.matrix.org.
+ Or you just start creating your own rooms with your friends.
+ Welcome to the Matrix universe :)
+
+