239badea9b 
								
							
								 
							
						 
						
							
							
								
								Use syntax that works on both py2.7 and py3  
							
							
							
						 
						
							2016-03-07 20:13:10 +00:00  
				
					
						
							
							
								 
						
							
							
								6a9f1209df 
								
							
								 
							
						 
						
							
							
								
								Error if macaroon key is missing from config  
							
							... 
							
							
							
							Currently we store all access tokens in the DB, and fall back to that
check if we can't validate the macaroon, so our fallback works here, but
for guests, their macaroons don't get persisted, so we don't get to
find them in the database. Each restart, we generate a new ephemeral
key, so guests lose access after each server restart.
I tried to fix up the config stuff to be less insane, but gave up, so
instead I bolt on yet another piece of custom one-off insanity.
Also, add some basic tests for config generation and loading. 
							
						 
						
							2016-02-05 01:58:23 +00:00  
				
					
						
							
							
								 
						
							
							
								6c28ac260c 
								
							
								 
							
						 
						
							
							
								
								copyrights  
							
							
							
						 
						
							2016-01-07 04:26:29 +00:00  
				
					
						
							
							
								 
						
							
							
								06f74068f4 
								
							
								 
							
						 
						
							
							
								
								Comment  
							
							
							
						 
						
							2015-11-19 13:05:51 +00:00  
				
					
						
							
							
								 
						
							
							
								037ce4c68f 
								
							
								 
							
						 
						
							
							
								
								Split out text for missing config options.  
							
							... 
							
							
							
							This allows packages to more easily override the default messages to
include package specific options. 
							
						 
						
							2015-11-18 18:37:05 +00:00  
				
					
						
							
							
								 
						
							
							
								6a9c4cfd0b 
								
							
								 
							
						 
						
							
							
								
								Fix race creating directories  
							
							
							
						 
						
							2015-11-12 11:58:48 +00:00  
				
					
						
							
							
								 
						
							
							
								6d7f291b93 
								
							
								 
							
						 
						
							
							
								
								Front-load spaces  
							
							
							
						 
						
							2015-09-22 13:13:07 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								fd0a919af3 
								
							
								 
							
						 
						
							
							
								
								Lists use 'append'  
							
							
							
						 
						
							2015-09-02 17:27:59 +01:00  
				
					
						
							
							
								 
						
							
							
								b442217d91 
								
							
								 
							
						 
						
							
							
								
								Actually add config path  
							
							
							
						 
						
							2015-08-28 10:37:17 +01:00  
				
					
						
							
							
								 
						
							
							
								0de2aad061 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #250  from matrix-org/erikj/generated_directory  
							
							... 
							
							
							
							Add config option to specify where generated files should be dumped 
							
						 
						
							2015-08-25 17:40:19 +01:00  
				
					
						
							
							
								 
						
							
							
								3f6f74686a 
								
							
								 
							
						 
						
							
							
								
								Update config doc  
							
							
							
						 
						
							2015-08-25 17:37:21 +01:00  
				
					
						
							
							
								 
						
							
							
								82145912c3 
								
							
								 
							
						 
						
							
							
								
								s/--generated-directory/--keys-directory/  
							
							
							
						 
						
							2015-08-25 17:31:22 +01:00  
				
					
						
							
							
								 
						
							
							
								3e1029fe80 
								
							
								 
							
						 
						
							
							
								
								Warn if we encounter unexpected files in config directories  
							
							
							
						 
						
							2015-08-25 17:08:23 +01:00  
				
					
						
							
							
								 
						
							
							
								af7c1397d1 
								
							
								 
							
						 
						
							
							
								
								Add config option to specify where generated files should be dumped  
							
							
							
						 
						
							2015-08-25 16:58:01 +01:00  
				
					
						
							
							
								 
						
							
							
								bfb66773a4 
								
							
								 
							
						 
						
							
							
								
								Allow specifying directories as config files  
							
							
							
						 
						
							2015-08-25 16:25:54 +01:00  
				
					
						
							
							
								 
						
							
							
								7bbaab9432 
								
							
								 
							
						 
						
							
							
								
								Fix the --generate-keys option. Make it do the same thing as --generate-config does when the config file exists, but without printing a warning  
							
							
							
						 
						
							2015-08-12 11:57:37 +01:00  
				
					
						
							
							
								 
						
							
							
								e3c8e2c13c 
								
							
								 
							
						 
						
							
							
								
								Add a --generate-keys option  
							
							
							
						 
						
							2015-08-07 16:42:27 +01:00  
				
					
						
							
							
								 
						
							
							
								9a3cd1c00d 
								
							
								 
							
						 
						
							
							
								
								Correct -H SERVER_NAME in config-missing complaint message  
							
							
							
						 
						
							2015-06-16 16:03:35 +01:00  
				
					
						
							
							
								 
						
							
							
								97a64f3ebe 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/synapse into develop  
							
							
							
						 
						
							2015-05-07 09:33:42 +01:00  
				
					
						
							
							
								 
						
							
							
								b850c9fa04 
								
							
								 
							
						 
						
							
							
								
								Typo  
							
							
							
						 
						
							2015-05-07 09:33:30 +01:00  
				
					
						
							
							
								 
						
							
							
								e45b05647e 
								
							
								 
							
						 
						
							
							
								
								Fix the --help option for synapse  
							
							
							
						 
						
							2015-05-05 17:39:59 +01:00  
				
					
						
							
							
								 
						
							
							
								46a65c282f 
								
							
								 
							
						 
						
							
							
								
								Allow generate-config to run against an existing config file to generate default keys  
							
							
							
						 
						
							2015-05-01 13:54:38 +01:00  
				
					
						
							
							
								 
						
							
							
								2f1348f339 
								
							
								 
							
						 
						
							
							
								
								Write a default log_config when generating config  
							
							
							
						 
						
							2015-04-30 16:52:57 +01:00  
				
					
						
							
							
								 
						
							
							
								74aaacf82a 
								
							
								 
							
						 
						
							
							
								
								Don't break when sizes or durations are given as integers  
							
							
							
						 
						
							2015-04-30 16:04:02 +01:00  
				
					
						
							
							
								 
						
							
							
								1aa11cf7ce 
								
							
								 
							
						 
						
							
							
								
								Allow multiple config files, set up a default config before applying the config files  
							
							
							
						 
						
							2015-04-30 13:48:15 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								4ad8b45155 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into key_distribution  
							
							... 
							
							
							
							Conflicts:
	synapse/config/homeserver.py 
							
						 
						
							2015-04-29 13:15:14 +01:00  
				
					
						
							
							
								 
						
							
							
								0bc71103e1 
								
							
								 
							
						 
						
							
							
								
								Output vim style mode markers into the yaml config file  
							
							
							
						 
						
							2015-04-28 10:17:10 +01:00  
				
					
						
							
							
								 
						
							
							
								288702170d 
								
							
								 
							
						 
						
							
							
								
								Add config for setting the perspective servers  
							
							
							
						 
						
							2015-04-24 17:01:34 +01:00  
				
					
						
							
							
								 
						
							
							
								b1e68add19 
								
							
								 
							
						 
						
							
							
								
								Add a config file for perspective servers  
							
							
							
						 
						
							2015-04-24 11:26:19 +01:00  
				
					
						
							
							
								 
						
							
							
								f5a70e0d2e 
								
							
								 
							
						 
						
							
							
								
								Add a cache for get_event  
							
							
							
						 
						
							2015-02-11 15:01:15 +00:00  
				
					
						
							
							
								 
						
							
							
								8ce100c7b4 
								
							
								 
							
						 
						
							
							
								
								Convert directory paths to absolute paths before daemonizing  
							
							
							
						 
						
							2015-02-09 18:30:00 +00:00  
				
					
						
							
							
								 
						
							
							
								adb04b1e57 
								
							
								 
							
						 
						
							
							
								
								Update copyright notices  
							
							
							
						 
						
							2015-01-06 13:21:39 +00:00  
				
					
						
							
							
								 
						
							
							
								3983c7fb0f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse into develop  
							
							
							
						 
						
							2014-12-13 18:16:12 +00:00  
				
					
						
							
							
								 
						
							
							
								6380ead2ee 
								
							
								 
							
						 
						
							
							
								
								Fix bug while generating the error message when a file path specified in the config doesn't exist  
							
							
							
						 
						
							2014-12-13 18:03:01 +00:00  
				
					
						
							
							
								 
						
							
							
								5da65085d1 
								
							
								 
							
						 
						
							
							
								
								Get uploads working with new media repo  
							
							
							
						 
						
							2014-12-02 19:51:47 +00:00  
				
					
						
							
							
								 
						
							
							
								fe3401e037 
								
							
								 
							
						 
						
							
							
								
								Be more helpful and tell the user how to generate a config too.  
							
							
							
						 
						
							2014-11-14 13:30:06 +00:00  
				
					
						
							
							
								 
						
							
							
								933ce76057 
								
							
								 
							
						 
						
							
							
								
								Adding --generate-config will not help if the user has not specified a config file.  
							
							
							
						 
						
							2014-11-14 13:24:12 +00:00  
				
					
						
							
							
								 
						
							
							
								7d709542ca 
								
							
								 
							
						 
						
							
							
								
								Fix pep8 warnings  
							
							
							
						 
						
							2014-10-30 11:10:17 +00:00  
				
					
						
							
							
								 
						
							
							
								d694619a95 
								
							
								 
							
						 
						
							
							
								
								Fix ncorrect ports in documentation and add notes on how generate-config also generates certs bound to whatever hostname you give with --generate-config.  
							
							... 
							
							
							
							SYN-87 #resolved 
							
						 
						
							2014-10-02 14:09:27 +01:00  
				
					
						
							
							
								 
						
							
							
								7a322b6326 
								
							
								 
							
						 
						
							
							
								
								Update README setup instructions to be correct. Make synapse spit out explanatory note when generating config to tell people to look at it and customise it.  
							
							
							
						 
						
							2014-10-02 10:43:22 +01:00  
				
					
						
							
							
								 
						
							
							
								4c3512a45c 
								
							
								 
							
						 
						
							
							
								
								Added a TODO note about YAML modeline for editors  
							
							
							
						 
						
							2014-09-03 19:30:48 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								c6eafdfbaf 
								
							
								 
							
						 
						
							
							
								
								Add copyright notices and fix pyflakes errors  
							
							
							
						 
						
							2014-09-03 09:43:11 +01:00  
				
					
						
							
							
								 
						
							
							
								45570e4695 
								
							
								 
							
						 
						
							
							
								
								os.makedirs is almost but not entirely unlike mkdir -p  
							
							
							
						 
						
							2014-09-02 10:58:05 +01:00  
				
					
						
							
							
								 
						
							
							
								30572e28c2 
								
							
								 
							
						 
						
							
							
								
								Make the config directory if the directory doesn't exisit when generating config  
							
							
							
						 
						
							2014-09-02 10:52:25 +01:00  
				
					
						
							
							
								 
						
							
							
								d45f89c95b 
								
							
								 
							
						 
						
							
							
								
								More helpful error messages for missing config  
							
							
							
						 
						
							2014-09-02 10:49:11 +01:00  
				
					
						
							
							
								 
						
							
							
								6fd730c96b 
								
							
								 
							
						 
						
							
							
								
								Use yaml for config file  
							
							
							
						 
						
							2014-09-01 20:44:51 +01:00  
				
					
						
							
							
								 
						
							
							
								9ea1de432d 
								
							
								 
							
						 
						
							
							
								
								Fix homeserver config parsing  
							
							
							
						 
						
							2014-09-01 15:51:15 +01:00