147 Commits

Author	SHA1	Message	Date
Erik Johnston	9c5fc81c2d	Correctly handle x_forwaded listener option	2015-06-12 17:13:23 +01:00
Erik Johnston	fd2c07bfed	Use config.listeners	2015-06-12 15:33:07 +01:00
Erik Johnston	f7f07dc517	Begin changing the config format	2015-06-11 15:48:52 +01:00
Erik Johnston	522f285f9b	Add config option to disable compression of http responses	2015-06-01 13:36:30 +01:00
Mark Haines	d70c847b4f	Merge pull request #170 from matrix-org/markjh/SYT-8-recaptcha ... Allow endpoint for verifying recaptcha to be configured	2015-05-29 15:32:54 +01:00
Mark Haines	784aaa53df	Merge branch 'develop' into markjh/SYT-8-recaptcha ... Conflicts: synapse/handlers/auth.py	2015-05-29 13:49:44 +01:00
Erik Johnston	a7b65bdedf	Add config option to turn off freezing events. Use new encode_json api and ujson.loads	2015-05-29 12:17:33 +01:00
Mark Haines	d94590ed48	Add config for setting the recaptcha verify api endpoint, so we can test it in sytest	2015-05-29 12:11:40 +01:00
Erik Johnston	36b3b75b21	Registration should be disabled by default	2015-05-28 11:01:34 +01:00
Erik Johnston	1ce1509989	s/metric_interface/metric_bind_host/	2015-05-22 14:51:22 +01:00
Erik Johnston	59a0682f3e	Enable changing the interface the metrics listener binds to	2015-05-22 13:13:07 +01:00
David Baker	97a64f3ebe	Merge branch 'develop' of github.com:matrix-org/synapse into develop	2015-05-07 09:33:42 +01:00
David Baker	b850c9fa04	Typo	2015-05-07 09:33:30 +01:00
Mark Haines	e45b05647e	Fix the --help option for synapse	2015-05-05 17:39:59 +01:00
Mark Haines	3bcdf3664c	Use the daemonize key from the config if it exists	2015-05-01 14:34:55 +01:00
Mark Haines	46a65c282f	Allow generate-config to run against an existing config file to generate default keys	2015-05-01 13:54:38 +01:00
Mark Haines	50c87b8eed	Allow "manhole" to be ommited from the config	2015-04-30 18:11:47 +01:00
Mark Haines	345995fcde	Remove the ~, comment the lines instead	2015-04-30 18:10:19 +01:00
Mark Haines	62cebee8ee	Update key.py	2015-04-30 17:54:01 +01:00
Mark Haines	95cbfee8ae	Update metrics.py	2015-04-30 17:52:20 +01:00
Mark Haines	2d4d2bbae4	Merge branch 'develop' into markjh/config_cleanup ... Conflicts: synapse/config/captcha.py	2015-04-30 16:54:55 +01:00
Mark Haines	2f1348f339	Write a default log_config when generating config	2015-04-30 16:52:57 +01:00
David Baker	5b02f33451	Undo changes to logger config, ie. remove the access_log_file option: decision is to support this through log_config rather tan adding an option.	2015-04-30 16:21:39 +01:00
David Baker	054aa0d58c	Do access log using python's logging stuff, just under a separate logger name	2015-04-30 16:21:38 +01:00
Mark Haines	74aaacf82a	Don't break when sizes or durations are given as integers	2015-04-30 16:04:02 +01:00
Mark Haines	c28f1d16f0	Add a random string to the auto generated key id	2015-04-30 15:13:14 +01:00
Mark Haines	265f30bd3f	Allow --enable-registration to be passed on the commandline	2015-04-30 15:04:06 +01:00
Mark Haines	c9e62927f2	Use disable_registration keys if they are present	2015-04-30 14:34:09 +01:00
David Baker	d89a9f7283	Add an access_log ... SYN-161 #resolve	2015-04-30 13:58:13 +01:00
Mark Haines	1aa11cf7ce	Allow multiple config files, set up a default config before applying the config files	2015-04-30 13:48:15 +01:00
Mark Haines	6b69ddd17a	remove duplicate parse_size method	2015-04-30 04:26:29 +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
Mark Haines	4ad8b45155	Merge branch 'develop' into key_distribution ... Conflicts: synapse/config/homeserver.py	2015-04-29 13:15:14 +01:00
Mark Haines	f4c9ebbc34	Delete ugly commented out log line.	2015-04-29 11:07:13 +01:00
Matthew Hodgson	68c0603946	comment out ugly test logline	2015-04-29 00:14:44 +01:00
Erik Johnston	327ca883ec	Merge branch 'develop' of github.com:matrix-org/synapse into postgres	2015-04-28 13:39:42 +01:00
Mark Haines	9182f87664	Merge pull request #126 from matrix-org/csauth ... Client / Server Auth Refactor	2015-04-28 11:00:27 +01:00
Mark Haines	0bc71103e1	Output vim style mode markers into the yaml config file	2015-04-28 10:17:10 +01:00
Erik Johnston	1ef66cc3bd	Move database configuration into config module	2015-04-27 15:57:43 +01:00
Erik Johnston	6f8e2d517e	Merge branch 'develop' of github.com:matrix-org/synapse into postgres	2015-04-27 14:41:40 +01:00
Mark Haines	288702170d	Add config for setting the perspective servers	2015-04-24 17:01:34 +01:00
Mark Haines	c253b14f6e	Merge branch 'develop' into key_distribution	2015-04-24 11:29:46 +01:00
Mark Haines	bdcb23ca25	Fix spelling	2015-04-24 11:29:19 +01:00
Mark Haines	b2c2dc8940	Merge branch 'develop' into key_distribution	2015-04-24 11:28:10 +01:00
Mark Haines	869dc94cbb	Call the super classes when generating config	2015-04-24 11:27:56 +01:00
Mark Haines	b1e68add19	Add a config file for perspective servers	2015-04-24 11:26:19 +01:00
Mark Haines	c8c710eca7	Move the key related config parser into a separate file	2015-04-24 10:22:22 +01:00
Mark Haines	149ed9f151	Better help for the old-signing-key option	2015-04-24 10:07:55 +01:00
David Baker	2e0d9219b9	Remove now-redundant email config	2015-04-23 11:45:29 +01:00
Mark Haines	f30d47c876	Implement remote key lookup api	2015-04-22 14:21:08 +01:00