Richard van der Hoff
7a22a645b5
Merge branch 'master' into develop
2019-02-07 19:18:48 +00:00
Richard van der Hoff
624b172e08
Merge remote-tracking branch 'origin/release-v0.99.0'
2019-02-07 19:18:26 +00:00
Andrew Morgan
c17b128b83
Update ACME docs to include port instructions ( #4578 )
2019-02-07 19:18:08 +00:00
Richard van der Hoff
9b7aa543d9
clarify option 1
2019-02-07 18:46:02 +00:00
Hubert Chathi
d9e424bf64
re-try to make isort happy
2019-02-06 22:18:41 -05:00
Hubert Chathi
51b73be63b
add changelog entry
2019-02-06 21:39:56 -05:00
Hubert Chathi
9ff620a518
fix import to make isort happy
2019-02-06 21:32:52 -05:00
Hubert Chathi
8248637173
add new endpoint to update backup versions
2019-02-06 17:57:10 -05:00
Hubert Chathi
664c81e8b7
return proper error codes for some 404s
2019-02-06 17:47:22 -05:00
Richard van der Hoff
7fe407a87a
Merge branch 'master' into develop
2019-02-06 09:50:54 +00:00
Richard van der Hoff
d8e63846e2
Fix docker upload job to push -py2 images ( #4576 )
2019-02-06 09:41:54 +00:00
Richard van der Hoff
6fe1db5631
Merge branch 'master' into develop
2019-02-05 19:00:50 +00:00
Richard van der Hoff
b05dd4ac06
faq cleanups
2019-02-05 18:59:57 +00:00
Richard van der Hoff
2475434080
Merge branch 'master' into develop
2019-02-05 18:44:49 +00:00
Richard van der Hoff
3bd9daf4b8
v0.99.0
2019-02-05 18:33:02 +00:00
Richard van der Hoff
39bf0ea2e8
Add notes on SRV and .well-known ( #4573 )
2019-02-05 18:11:26 +00:00
Richard van der Hoff
61dc53abe9
fix some thinkos in UPGRADE.rst
2019-02-05 17:36:05 +00:00
Andrew Morgan
4a7524ffd3
Merge pull request #4570 from matrix-org/anoa/self_signed_upgrade
...
Add ACME docs and link to it from README and INSTALL
2019-02-05 17:34:43 +00:00
Neil Johnson
6585ef4799
Neilj/1711faq ( #4572 )
...
MSC1711 certificates FAQ
2019-02-05 17:19:28 +00:00
Andrew Morgan
a6345009f9
Add TL;DR and final step details to ACME
2019-02-05 17:04:34 +00:00
Andrew Morgan
56cb34ba8b
Merge branch 'anoa/self_signed_upgrade' of github.com:matrix-org/synapse into anoa/self_signed_upgrade
2019-02-05 16:53:05 +00:00
Andrew Morgan
2ca63df83b
Update ACME
2019-02-05 16:50:00 +00:00
Richard van der Hoff
13828f7d58
Update docs/ACME.md
...
Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com>
2019-02-05 16:46:28 +00:00
Andrew Morgan
e119cec229
Update INSTALL
2019-02-05 16:45:41 +00:00
Andrew Morgan
ed8b3289ff
Update README
2019-02-05 16:44:31 +00:00
Andrew Morgan
ffcbd80982
Actually add ACME docs
2019-02-05 15:50:18 +00:00
Andrew Morgan
0af50020fd
Move ACME docs from INSTALL.md to ACME.md
2019-02-05 15:49:34 +00:00
Andrew Morgan
d75e15edce
Re-add link to ACME docs from README
2019-02-05 15:45:00 +00:00
Andrew Morgan
c433d4c4d2
Merge branch 'release-v0.99.0' of github.com:matrix-org/synapse into anoa/self_signed_upgrade
2019-02-05 15:43:26 +00:00
Andrew Morgan
cbdc01cc3b
Convert ACME docs to md
2019-02-05 15:38:27 +00:00
Andrew Morgan
9793bf366e
Add link to ACME docs from README
2019-02-05 15:34:52 +00:00
Andrew Morgan
08b26afeee
Move ACME docs to docs/ACME.rst and link from UPGRADE.
2019-02-05 15:33:23 +00:00
Andrew Morgan
cd6fee3169
Don't imply self-signed certs are required
2019-02-05 14:29:09 +00:00
Richard van der Hoff
4561f3baa0
Move things from README.rst to UPDATE.md ( #4569 )
...
The readme was getting pretty unmanageable and hard to grok. This is an attempt to simplify things by moving installation instructions from the README to a separate file. I've tried to resist the temptation to fix too much stuff while I'm here - it mostly just copies-and-pastes from one doc to the other, and changes from rst to md syntax.
2019-02-05 13:55:21 +00:00
Richard van der Hoff
40b35fb875
Enable ACME support in the docker image ( #4566 )
...
Also:
* Fix wrapping in docker readme
* Clean up some docs on the docker image
* a workaround for #4554
2019-02-05 13:42:21 +00:00
Andrew Morgan
627ecd358e
Filter user directory state query to a subset of state events ( #4462 )
...
* Filter user directory state query to a subset of state events
* Add changelog
2019-02-05 12:16:28 +00:00
Richard van der Hoff
3ef71a6ea0
Docker: only copy what we need to the build image ( #4562 )
...
There are two reasons this is a good thing:
* first, it means that you don't end up with stuff kicking around your working
copy ending up in the build image by mistake (which can upset the pip
install process)
* second: it means that the docker image cache is more effective, and we can
reuse docker images when iterating on the docker stuff.
2019-02-05 11:44:40 +00:00
Richard van der Hoff
bf1e4d96ad
Fix default ACME config for py2 ( #4564 )
...
Fixes #4559
2019-02-05 11:37:33 +00:00
Richard van der Hoff
9a75c0b52e
switch docker image to py3 by default ( #4558 )
...
Switch the matrixdotorg/synapse:latest Docker image to use python 3
2019-02-05 11:33:26 +00:00
Richard van der Hoff
d7e27a1f08
fix typo in config comments ( #4557 )
2019-02-05 11:32:45 +00:00
Andrew Morgan
142b2cddf0
Merge pull request #4547 from matrix-org/anoa/acme_docs
...
Add docs for ACME setup
2019-02-01 17:19:52 +00:00
Andrew Morgan
da6df65e19
Fix nginx capatilization
2019-02-01 16:59:23 +00:00
Andrew Morgan
57164e17da
Address comments
2019-02-01 16:59:06 +00:00
Richard van der Hoff
9e89a420e8
Update README.rst
...
Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com>
2019-02-01 16:54:47 +00:00
Richard van der Hoff
897230f634
Update README.rst
...
Co-Authored-By: anoadragon453 <1342360+anoadragon453@users.noreply.github.com>
2019-02-01 16:54:32 +00:00
Andrew Morgan
14de15eaa4
Actually need to enable it
2019-02-01 16:48:07 +00:00
Andrew Morgan
bcc78bb0b8
Merge branch 'release-v0.99.0' of github.com:matrix-org/synapse into anoa/acme_docs
2019-02-01 15:57:32 +00:00
Richard van der Hoff
30fd2f89db
0.99.0rc4
2019-02-01 15:52:28 +00:00
Andrew Morgan
0d70288c59
Address changes
2019-02-01 15:38:09 +00:00
Andrew Morgan
7f914a2dbf
Remove error and add link to foks fed tester project
2019-02-01 15:05:10 +00:00
