Neil Johnson
							
						 
						
							 
							
							
							
								
							
								0b01281e77 
								
							
								 
							
						 
						
							
							
								
								move threepid checker to config, add missing yields  
							
							 
							
							
							
						 
						
							2018-08-31 17:11:11 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								05077e06fa 
								
							
								 
							
						 
						
							
							
								
								Change admin_uri to admin_contact in config and errors  
							
							 
							
							
							
						 
						
							2018-08-24 16:51:27 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								cd77270a66 
								
							
								 
							
						 
						
							
							
								
								Implement trail users  
							
							 
							
							
							
						 
						
							2018-08-23 19:17:19 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								c334ca67bb 
								
									
								
							
								 
							
						 
						
							
							
								
								Integrate presence from hotfixes ( #3694 )  
							
							 
							
							
							
						 
						
							2018-08-18 01:08:45 +10:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								0195dfbf52 
								
							
								 
							
						 
						
							
							
								
								server limits config docs  
							
							 
							
							
							
						 
						
							2018-08-17 13:58:25 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								13ad9930c8 
								
							
								 
							
						 
						
							
							
								
								add new error type ResourceLimit  
							
							 
							
							
							
						 
						
							2018-08-16 18:02:02 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								55afba0fc5 
								
							
								 
							
						 
						
							
							
								
								update admin email to uri  
							
							 
							
							
							
						 
						
							2018-08-15 11:41:18 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								ab035bdeac 
								
							
								 
							
						 
						
							
							
								
								replace admin_email with admin_uri for greater flexibility  
							
							 
							
							
							
						 
						
							2018-08-15 10:16:41 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								f4b49152e2 
								
							
								 
							
						 
						
							
							
								
								support admin_email config and pass through into blocking errors, return AuthError in all cases  
							
							 
							
							
							
						 
						
							2018-08-13 21:09:47 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								ce7de9ae6b 
								
							
								 
							
						 
						
							
							
								
								Revert "support admin_email config and pass through into blocking errors, return AuthError in all cases"  
							
							 
							
							... 
							
							
							
							This reverts commit 0d43f991a1 . 
							
						 
						
							2018-08-13 18:06:18 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								0d43f991a1 
								
							
								 
							
						 
						
							
							
								
								support admin_email config and pass through into blocking errors, return AuthError in all cases  
							
							 
							
							
							
						 
						
							2018-08-13 18:00:23 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
								
								
							
							
								
							
								d2f3ef98ac 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into neilj/disable_hs  
							
							 
							
							
							
						 
						
							2018-08-08 15:55:47 +00:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								e8eba2b4e3 
								
							
								 
							
						 
						
							
							
								
								implement reserved users for mau limits  
							
							 
							
							
							
						 
						
							2018-08-07 17:49:43 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								7daa8a78c5 
								
							
								 
							
						 
						
							
							
								
								load mau limit threepids  
							
							 
							
							
							
						 
						
							2018-08-06 22:55:05 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								42c6823827 
								
							
								 
							
						 
						
							
							
								
								disable HS from config  
							
							 
							
							
							
						 
						
							2018-08-04 22:07:04 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								5593ff6773 
								
							
								 
							
						 
						
							
							
								
								fix (lots of) py3 test failures  
							
							 
							
							
							
						 
						
							2018-08-03 14:59:17 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								704c3e6239 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' into develop  
							
							 
							
							
							
						 
						
							2018-08-02 15:43:30 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								2c54f1c225 
								
							
								 
							
						 
						
							
							
								
								remove need to plot limit_usage_by_mau  
							
							 
							
							
							
						 
						
							2018-08-01 11:46:59 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								df2235e7fa 
								
							
								 
							
						 
						
							
							
								
								coding style  
							
							 
							
							
							
						 
						
							2018-07-31 13:16:20 +01:00  
						
					 
				
					
						
							
							
								 
								Neil Johnson
							
						 
						
							 
							
							
							
								
							
								251e6c1210 
								
							
								 
							
						 
						
							
							
								
								limit register and sign in on number of monthly users  
							
							 
							
							
							
						 
						
							2018-07-30 15:55:57 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
								
								
							
							
								
							
								5f3658baf5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3377  from Valodim/note-affinity  
							
							 
							
							... 
							
							
							
							document that the affinity package is required for the cpu_affinity setting 
							
						 
						
							2018-07-19 14:35:06 +01:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
							
								
							
								49af402019 
								
							
								 
							
						 
						
							
							
								
								run isort  
							
							 
							
							
							
						 
						
							2018-07-09 16:09:20 +10:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								546bc9e28b 
								
							
								 
							
						 
						
							
							
								
								More server_name validation  
							
							 
							
							... 
							
							
							
							We need to do a bit more validation when we get a server name, but don't want
to be re-doing it all over the shop, so factor out a separate
parse_and_validate_server_name, and do the extra validation.
Also, use it to verify the server name in the config file. 
							
						 
						
							2018-07-04 18:59:51 +01:00  
						
					 
				
					
						
							
							
								 
								Vincent Breitmoser
							
						 
						
							 
							
							
							
								
							
								b800834351 
								
							
								 
							
						 
						
							
							
								
								add note that the affinity package is required for the cpu_affinity setting  
							
							 
							
							
							
						 
						
							2018-06-09 22:50:29 +02:00  
						
					 
				
					
						
							
							
								 
								Amber Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								febe0ec8fd 
								
									
								
							
								 
							
						 
						
							
							
								
								Run Prometheus on a different port, optionally. ( #3274 )  
							
							 
							
							
							
						 
						
							2018-05-31 19:04:50 +10:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
								
								
							
							
								
							
								ab9f844aaf 
								
									
								
							
								 
							
						 
						
							
							
								
								Add federation_domain_whitelist option ( #2820 )  
							
							 
							
							... 
							
							
							
							Add federation_domain_whitelist
gives a way to restrict which domains your HS is allowed to federate with.
useful mainly for gracefully preventing a private but internet-connected HS from trying to federate to the wider public Matrix network 
							
						 
						
							2018-01-22 19:11:18 +01:00  
						
					 
				
					
						
							
							
								 
								Silke Hofstra
							
						 
						
							 
							
							
							
								
							
								37d1a90025 
								
							
								 
							
						 
						
							
							
								
								Allow binds to both :: and 0.0.0.0  
							
							 
							
							... 
							
							
							
							Binding on 0.0.0.0 when :: is specified in the bind_addresses is now allowed.
This causes a warning explaining the behaviour.
Configuration changed to match.
See #2232 
Signed-off-by: Silke Hofstra <silke@slxh.eu> 
							
						 
						
							2017-12-17 13:10:31 +01:00  
						
					 
				
					
						
							
							
								 
								Willem Mulder
							
						 
						
							 
							
							
							
								
							
								3e59143ba8 
								
							
								 
							
						 
						
							
							
								
								Adapt the default config to bind on IPv6.  
							
							 
							
							... 
							
							
							
							Most deployments are on Linux (or Mac OS), so this would actually bind
on both IPv4 and IPv6.
Resolves  #1886 .
Signed-off-by: Willem Mulder <willemmaster@hotmail.com> 
							
						 
						
							2017-12-17 13:07:37 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								68ca864141 
								
							
								 
							
						 
						
							
							
								
								Add config option to disable media_repo on main synapse  
							
							 
							
							... 
							
							
							
							... to stop us doing the cache cleanup jobs on the master. 
							
						 
						
							2017-11-22 16:20:27 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								fcdfc911ee 
								
							
								 
							
						 
						
							
							
								
								Add a hook for custom rest endpoints  
							
							 
							
							... 
							
							
							
							Let the user specify custom modules which can be used for implementing extra
endpoints. 
							
						 
						
							2017-11-02 14:36:55 +00:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								eaaabc6c4f 
								
							
								 
							
						 
						
							
							
								
								replace 'except:' with 'except Exception:'  
							
							 
							
							... 
							
							
							
							what could possibly go wrong 
							
						 
						
							2017-10-23 15:52:32 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								aa620d09a0 
								
							
								 
							
						 
						
							
							
								
								Add a config option to block all room invites ( #2457 )  
							
							 
							
							... 
							
							
							
							- allows sysadmins the ability to lock down their servers so that people can't
send their users room invites. 
							
						 
						
							2017-09-19 16:08:14 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								d2352347cf 
								
							
								 
							
						 
						
							
							
								
								Fix process startup  
							
							 
							
							... 
							
							
							
							escape the % that got added in 92168cb  so that the process starts up ok. 
							
						 
						
							2017-08-16 14:57:35 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								92168cbbc5 
								
							
								 
							
						 
						
							
							
								
								explain why CPU affinity is a good idea  
							
							 
							
							
							
						 
						
							2017-08-15 18:27:42 +01:00  
						
					 
				
					
						
							
							
								 
								Richard van der Hoff
							
						 
						
							 
							
							
							
								
							
								10d8b701a1 
								
							
								 
							
						 
						
							
							
								
								Allow configuration of CPU affinity  
							
							 
							
							... 
							
							
							
							Make it possible to set the CPU affinity in the config file, so that we don't
need to remember to do it manually every time. 
							
						 
						
							2017-08-15 17:08:28 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								6aa5bc8635 
								
							
								 
							
						 
						
							
							
								
								Initial worker impl  
							
							 
							
							
							
						 
						
							2017-06-16 11:47:11 +01:00  
						
					 
				
					
						
							
							
								 
								Pablo Saavedra
							
						 
						
							 
							
							
							
								
							
								9da4316ca5 
								
							
								 
							
						 
						
							
							
								
								Configurable maximum number of events requested by /sync and /messages ( #2220 )  
							
							 
							
							... 
							
							
							
							Set the limit on the returned events in the timeline in the get and sync
operations. The default value is -1, means no upper limit.
For example, using `filter_timeline_limit: 5000`:
POST /_matrix/client/r0/user/user:id/filter
{
room: {
    timeline: {
      limit: 1000000000000000000
    }
}
}
GET /_matrix/client/r0/user/user:id/filter/filter:id
{
room: {
    timeline: {
      limit: 5000
    }
}
}
The server cuts down the room.timeline.limit. 
							
						 
						
							2017-05-13 18:17:54 +02:00  
						
					 
				
					
						
							
							
								 
								Matthew Wolff
							
						 
						
							 
							
							
								
								
							
							
								
							
								8e780b113d 
								
									
								
							
								 
							
						 
						
							
							
								
								web_server_root documentation fix  
							
							 
							
							... 
							
							
							
							Signed-off-by: Matthew Wolff <matthewjwolff@gmail.com> 
							
						 
						
							2017-04-17 00:49:11 -05:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								b1dfd20292 
								
							
								 
							
						 
						
							
							
								
								Pop bind_address  
							
							 
							
							
							
						 
						
							2017-01-10 17:23:18 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								edd6cdfc9a 
								
							
								 
							
						 
						
							
							
								
								Restore default bind address  
							
							 
							
							
							
						 
						
							2017-01-10 17:21:41 +00:00  
						
					 
				
					
						
							
							
								 
								Johannes Löthberg
							
						 
						
							 
							
							
							
								
							
								f5cd5ebd7b 
								
							
								 
							
						 
						
							
							
								
								Add IPv6 comment to default config  
							
							 
							
							... 
							
							
							
							Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> 
							
						 
						
							2016-12-18 23:14:32 +01:00  
						
					 
				
					
						
							
							
								 
								Johannes Löthberg
							
						 
						
							 
							
							
							
								
							
								c95e9fff99 
								
							
								 
							
						 
						
							
							
								
								Make default homeserver config use bind_addresses  
							
							 
							
							... 
							
							
							
							Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> 
							
						 
						
							2016-12-18 21:51:56 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								ed787cf09e 
								
							
								 
							
						 
						
							
							
								
								Hook up the send queue and create a federation sender worker  
							
							 
							
							
							
						 
						
							2016-11-16 17:34:44 +00:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								4131381123 
								
							
								 
							
						 
						
							
							
								
								Remove support for aggregate room lists  
							
							 
							
							
							
						 
						
							2016-09-15 09:28:15 +01:00  
						
					 
				
					
						
							
							
								 
								Matthew Hodgson
							
						 
						
							 
							
							
							
								
							
								63bb8f0df9 
								
							
								 
							
						 
						
							
							
								
								remove vector.im from default secondary DS list  
							
							 
							
							
							
						 
						
							2016-06-27 13:13:33 +04:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								13e334506c 
								
							
								 
							
						 
						
							
							
								
								Remove the legacy v0 content upload API.  
							
							 
							
							... 
							
							
							
							The existing content can still be downloaded. The last upload to the
matrix.org server was in January 2015, so it is probably safe to remove
the upload API. 
							
						 
						
							2016-06-21 11:47:39 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								3e41de05cc 
								
							
								 
							
						 
						
							
							
								
								Turn use_frozen_events off by default  
							
							 
							
							
							
						 
						
							2016-06-17 15:11:22 +01:00  
						
					 
				
					
						
							
							
								 
								Mark Haines
							
						 
						
							 
							
							
							
								
							
								885ee861f7 
								
							
								 
							
						 
						
							
							
								
								Inline the synchrotron and pusher configs into the main config  
							
							 
							
							
							
						 
						
							2016-06-16 11:06:12 +01:00  
						
					 
				
					
						
							
							
								 
								Erik Johnston
							
						 
						
							 
							
							
							
								
							
								dded389ac1 
								
							
								 
							
						 
						
							
							
								
								Allow setting of gc.set_thresholds  
							
							 
							
							
							
						 
						
							2016-06-07 15:45:56 +01:00  
						
					 
				
					
						
							
							
								 
								David Baker
							
						 
						
							 
							
							
							
								
							
								6ca4d3ae9a 
								
							
								 
							
						 
						
							
							
								
								Add vector.im to default secondary_directory_servers and add comment explaining it's not a permanent solution  
							
							 
							
							
							
						 
						
							2016-05-31 17:24:50 +01:00