70 Commits

Author	SHA1	Message	Date
Erik Johnston	90dbd71c13	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-07-21 09:25:30 +01:00
Erik Johnston	294dbd712f	We don't want semicolons.	2015-07-09 11:47:24 +01:00
Matthew Hodgson	fb8d2862c1	remove the tls_certificate_chain_path param and simply support tls_certificate_path pointing to a file containing a chain of certificates	2015-07-09 00:45:41 +01:00
Matthew Hodgson	8ad2d2d1cb	document tls_certificate_chain_path more clearly	2015-07-09 00:06:01 +01:00
Matthew Hodgson	f26a3df1bf	oops, context.tls_certificate_chain_file() expects a file, not a certificate.	2015-07-08 21:33:02 +01:00
Matthew Hodgson	465acb0c6a	*cough*	2015-07-08 18:30:59 +01:00
Matthew Hodgson	64afbe6ccd	add new optional config for tls_certificate_chain_path for folks with intermediary SSL certs	2015-07-08 18:20:02 +01:00
Matthew Hodgson	04192ee05b	typo	2015-07-08 17:49:15 +01:00
Mark Haines	2f1348f339	Write a default log_config when generating config	2015-04-30 16:52:57 +01:00
Mark Haines	d624e2a638	Manually generate the default config yaml, remove most of the commandline arguments for synapse anticipating that people will use the yaml instead. Simpify implementing config options by not requiring the classes to hit the super class	2015-04-30 04:24:44 +01:00
Erik Johnston	e49d6b1568	Unused import	2015-03-06 11:37:24 +00:00
Erik Johnston	3ce8540484	Don't look for an TLS private key if we have set --no-tls	2015-03-06 11:34:06 +00:00
Mark Haines	adb04b1e57	Update copyright notices	2015-01-06 13:21:39 +00:00
Mark Haines	7d709542ca	Fix pep8 warnings	2014-10-30 11:10:17 +00:00
Matthew Hodgson	8a7c1d6a00	fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.	2014-09-03 17:31:57 +01:00
Mark Haines	64b341cc10	Fix typo when reading TLS config	2014-09-02 10:54:56 +01:00
Mark Haines	d45f89c95b	More helpful error messages for missing config	2014-09-02 10:49:11 +01:00
Mark Haines	8b69468e5f	Use pregenerated DH params when generating config	2014-09-01 20:35:18 +01:00
Mark Haines	9ea1de432d	Fix homeserver config parsing	2014-09-01 15:51:15 +01:00
Mark Haines	d9ebe531ed	Add config tree to synapse. Add support for reading config from a file	2014-08-31 16:06:39 +01:00