summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-10-23 10:11:58 +0100
committerGitHub <noreply@github.com>2018-10-23 10:11:58 +0100
commit1fe6bbb555698b53a5664e1864b5450d9ec318e0 (patch)
tree3b173d8ae7175db35581c9843eca8ade59295af2
parentMerge pull request #4076 from matrix-org/rav/fix_init_logcontexts (diff)
parentAdd information about the matrix-docker-ansible-deploy playbook (diff)
downloadsynapse-1fe6bbb555698b53a5664e1864b5450d9ec318e0.tar.xz
Merge pull request #3698 from spantaleev/add-matrix-docker-ansible-deploy
Add information about the matrix-docker-ansible-deploy playbook
-rw-r--r--README.rst6
-rw-r--r--changelog.d/3698.misc1
2 files changed, 7 insertions, 0 deletions
diff --git a/README.rst b/README.rst
index e1ea351f84..456a3d9d43 100644
--- a/README.rst
+++ b/README.rst
@@ -174,6 +174,12 @@ Alternatively, Andreas Peters (previously Silvio Fricke) has contributed a
 Dockerfile to automate a synapse server in a single Docker image, at
 https://hub.docker.com/r/avhost/docker-matrix/tags/
 
+Slavi Pantaleev has created an Ansible playbook,
+which installs the offical Docker image of Matrix Synapse
+along with many other Matrix-related services (Postgres database, riot-web, coturn, mxisd, SSL support, etc.).
+For more details, see
+https://github.com/spantaleev/matrix-docker-ansible-deploy
+
 Configuring Synapse
 -------------------
 
diff --git a/changelog.d/3698.misc b/changelog.d/3698.misc
new file mode 100644
index 0000000000..12537e76f2
--- /dev/null
+++ b/changelog.d/3698.misc
@@ -0,0 +1 @@
+Add information about the [matrix-docker-ansible-deploy](https://github.com/spantaleev/matrix-docker-ansible-deploy) playbook