Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								66a564c859 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix some DETECTED VIOLATIONS in the config file ( #7550 )  
							
							 
							
							... 
							
							
							
							consistency ftw 
							
						 
						
							2020-05-22 10:11:50 +01:00  
						
					 
				
					
						
							
							
								 
								Aaron Raimist
							
						 
						
							 
							
							
								
								
							
							
								
							
								6ca5e56fd1 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove unused captcha_bypass_secret option ( #7137 )  
							
							 
							
							... 
							
							
							
							Signed-off-by: Aaron Raimist <aaron@raim.ist> 
							
						 
						
							2020-03-25 17:49:34 +00:00  
						
					 
				
					
						
							
							
								 
								Andrew Morgan
							
						 
						
							 
							
							
							
								
							
								bc29a19731 
								
							
								 
							
						 
						
							
							
								
								Replace instance variations of homeserver with correct case/spacing  
							
							 
							
							
							
						 
						
							2019-11-12 13:08:12 +00:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								f743108a94 
								
									
								
							
								 
							
						 
						
							
							
								
								Refactor HomeserverConfig so it can be typechecked ( #6137 )  
							
							 
							
							
							
						 
						
							2019-10-10 09:39:35 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								16b52642e2 
								
							
								 
							
						 
						
							
							
								
								Don't load the generated config as the default.  
							
							 
							
							... 
							
							
							
							It's too confusing. 
							
						 
						
							2019-06-24 14:14:52 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								c3c6b00d95 
								
									
								
							
								 
							
						 
						
							
							
								
								Pass config_dir_path and data_dir_path into Config.read_config. ( #5522 )  
							
							 
							
							... 
							
							
							
							* Pull config_dir_path and data_dir_path calculation out of read_config_files
* Pass config_dir_path and data_dir_path into read_config 
							
						 
						
							2019-06-24 11:34:45 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								32e7c9e7f2 
								
									
								
							
								 
							
						 
						
							
							
								
								Run Black. ( #5482 )  
							
							 
							
							
							
						 
						
							2019-06-20 19:32:02 +10:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								fd463b4f5d 
								
									
								
							
								 
							
						 
						
							
							
								
								Comment out most options in the generated config. ( #4863 )  
							
							 
							
							... 
							
							
							
							Make it so that most options in the config are optional, and commented out in
the generated config.
The reasons this is a good thing are as follows:
* If we decide that we should change the default for an option, we can do so,
  and only those admins that have deliberately chosen to override that option
  will be stuck on the old setting.
* It moves us towards a point where we can get rid of the super-surprising
  feature of synapse where the default settings for the config come from the
  generated yaml.
* It makes setting up a test config for unit testing an order of magnitude
  easier (see forthcoming PR).
* It makes the generated config more consistent, and hopefully easier for users
  to understand. 
							
						 
						
							2019-03-19 10:06:40 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								70ea2f4e1d 
								
							
								 
							
						 
						
							
							
								
								switch from google.com to recaptcha.net for reCAPTCHA ( #4731 )  
							
							 
							
							... 
							
							
							
							* add trivial clarification about jemalloc
* switch from google.com to recaptcha.net
because https://developers.google.com/recaptcha/docs/faq#can-i-use-recaptcha-globally  
							
						 
						
							2019-02-25 11:15:36 -08:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								5f9bdf90fe 
								
							
								 
							
						 
						
							
							
								
								Attempt to make default config more consistent  
							
							 
							
							... 
							
							
							
							The general idea here is that config examples should just have a hash and no
extraneous whitespace, both to make it easier for people who don't understand
yaml, and to make the examples stand out from the comments. 
							
						 
						
							2019-02-19 13:54:29 +00:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								33546b58aa 
								
							
								 
							
						 
						
							
							
								
								point to the CAPTCHA docs  
							
							 
							
							
							
						 
						
							2016-06-12 23:11:29 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								6c28ac260c 
								
							
								 
							
						 
						
							
							
								
								copyrights  
							
							 
							
							
							
						 
						
							2016-01-07 04:26:29 +00:00  
						
					 
				
					
						
							
							
								 
								Robin Lambertz
							
						 
						
							 
							
							
							
								
							
								4106477e7f 
								
							
								 
							
						 
						
							
							
								
								Config Comment mixup in captcha public/private key  
							
							 
							
							
							
						 
						
							2016-01-06 23:19:33 +01:00  
						
					 
				
					
						
							
							
								 
								Daniel Wagner-Hall
							
						 
						
							 
							
							
							
								
							
								7213588083 
								
							
								 
							
						 
						
							
							
								
								Implement configurable stats reporting  
							
							 
							
							... 
							
							
							
							SYN-287
This requires that HS owners either opt in or out of stats reporting.
When --generate-config is passed, --report-stats must be specified
If an already-generated config is used, and doesn't have the
report_stats key, it is requested to be set. 
							
						 
						
							2015-09-22 12:57:40 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								62b4b72fe4 
								
							
								 
							
						 
						
							
							
								
								Close, but no cigar.  
							
							 
							
							
							
						 
						
							2015-07-14 10:33:25 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								186f61a3ac 
								
							
								 
							
						 
						
							
							
								
								Document listener config. Remove deprecated config options  
							
							 
							
							
							
						 
						
							2015-06-15 11:25:53 +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  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								345995fcde 
								
							
								 
							
						 
						
							
							
								
								Remove the ~, comment the lines instead  
							
							 
							
							
							
						 
						
							2015-04-30 18:10:19 +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  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								d89a9f7283 
								
							
								 
							
						 
						
							
							
								
								Add an access_log  
							
							 
							
							... 
							
							
							
							SYN-161 #resolve 
							
						 
						
							2015-04-30 13:58:13 +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  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								59bf16eddc 
								
							
								 
							
						 
						
							
							
								
								New registration for C/S API v2. Only ReCAPTCHA working currently.  
							
							 
							
							
							
						 
						
							2015-03-30 18:13:10 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								adb04b1e57 
								
							
								 
							
						 
						
							
							
								
								Update copyright notices  
							
							 
							
							
							
						 
						
							2015-01-06 13:21:39 +00:00  
						
					 
				
					
						
							
							
								 
								Paul "LeoNerd" Evans
							
						 
						
							 
							
							
							
								
							
								3a8a94448a 
								
							
								 
							
						 
						
							
							
								
								Allow a (hidden undocumented) key to m.login.recaptcha to specify a shared secret to allow bots to bypass the ReCAPTCHA test (SYN-60)  
							
							 
							
							
							
						 
						
							2014-09-23 14:29:08 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								3fa01be9e4 
								
							
								 
							
						 
						
							
							
								
								formatting  
							
							 
							
							
							
						 
						
							2014-09-19 12:04:26 +01:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								37e53513b6 
								
							
								 
							
						 
						
							
							
								
								Add config opion for XFF headers when performing ReCaptcha auth.  
							
							 
							
							
							
						 
						
							2014-09-05 22:51:11 -07:00  
						
					 
				
					
						
							
							
								 
								Kegan Dougal
							
						 
						
							 
							
							
							
								
							
								0b9e1e7b56 
								
							
								 
							
						 
						
							
							
								
								Added a captcha config to the HS, to enable registration captcha checking and for the recaptcha private key.  
							
							 
							
							
							
						 
						
							2014-09-05 17:58:06 -07:00