Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add function to load config without generating it | Mark Haines | 2016-06-09 | 1 | -43/+104 |
| | | | | | | | | | | | | | | | | Renames ``load_config`` to ``load_or_generate_config`` Adds a method called ``load_config`` that just loads the config. The main synapse.app.homeserver will continue to use ``load_or_generate_config`` to retain backwards compat. However new worker processes can use ``load_config`` to load the config avoiding some of the cruft needed to generate the config. As the new ``load_config`` method is expected to be used by new configs it removes support for the legacy commandline overrides that ``load_or_generate_config`` supports | ||||
* | Use syntax that works on both py2.7 and py3 | Mark Haines | 2016-03-07 | 1 | -1/+1 |
| | |||||
* | Error if macaroon key is missing from config | Daniel Wagner-Hall | 2016-02-05 | 1 | -13/+22 |
| | | | | | | | | | | | | | 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. | ||||
* | copyrights | Matthew Hodgson | 2016-01-07 | 1 | -1/+1 |
| | |||||
* | Comment | Erik Johnston | 2015-11-19 | 1 | -0/+2 |
| | |||||
* | Split out text for missing config options. | Erik Johnston | 2015-11-18 | 1 | -16/+26 |
| | | | | | This allows packages to more easily override the default messages to include package specific options. | ||||
* | Fix race creating directories | Daniel Wagner-Hall | 2015-11-12 | 1 | -1/+5 |
| | |||||
* | Front-load spaces | Daniel Wagner-Hall | 2015-09-22 | 1 | -7/+7 |
| | |||||
* | Implement configurable stats reporting | Daniel Wagner-Hall | 2015-09-22 | 1 | -4/+41 |
| | | | | | | | | | | 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. | ||||
* | Lists use 'append' | Erik Johnston | 2015-09-02 | 1 | -1/+1 |
| | |||||
* | Actually add config path | Erik Johnston | 2015-08-28 | 1 | -0/+2 |
| | |||||
* | Merge pull request #250 from matrix-org/erikj/generated_directory | Erik Johnston | 2015-08-25 | 1 | -2/+15 |
|\ | | | | | Add config option to specify where generated files should be dumped | ||||
| * | Update config doc | Erik Johnston | 2015-08-25 | 1 | -1/+2 |
| | | |||||
| * | s/--generated-directory/--keys-directory/ | Erik Johnston | 2015-08-25 | 1 | -7/+7 |
| | | |||||
| * | Add config option to specify where generated files should be dumped | Erik Johnston | 2015-08-25 | 1 | -2/+14 |
| | | |||||
* | | Warn if we encounter unexpected files in config directories | Erik Johnston | 2015-08-25 | 1 | -7/+17 |
|/ | |||||
* | Allow specifying directories as config files | Erik Johnston | 2015-08-25 | 1 | -6/+24 |
| | |||||
* | Fix the --generate-keys option. Make it do the same thing as ↵ | Mark Haines | 2015-08-12 | 1 | -45/+36 |
| | | | | --generate-config does when the config file exists, but without printing a warning | ||||
* | Add a --generate-keys option | Paul "LeoNerd" Evans | 2015-08-07 | 1 | -0/+9 |
| | |||||
* | Correct -H SERVER_NAME in config-missing complaint message | Paul "LeoNerd" Evans | 2015-06-16 | 1 | -2/+2 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into develop | David Baker | 2015-05-07 | 1 | -18/+29 |
|\ | |||||
| * | Fix the --help option for synapse | Mark Haines | 2015-05-05 | 1 | -18/+29 |
| | | |||||
* | | Typo | David Baker | 2015-05-07 | 1 | -1/+1 |
|/ | |||||
* | Allow generate-config to run against an existing config file to generate ↵ | Mark Haines | 2015-05-01 | 1 | -12/+23 |
| | | | | default keys | ||||
* | Write a default log_config when generating config | Mark Haines | 2015-04-30 | 1 | -1/+2 |
| | |||||
* | Don't break when sizes or durations are given as integers | Mark Haines | 2015-04-30 | 1 | -9/+12 |
| | |||||
* | Allow multiple config files, set up a default config before applying the ↵ | Mark Haines | 2015-04-30 | 1 | -21/+37 |
| | | | | config files | ||||
* | Manually generate the default config yaml, remove most of the commandline ↵ | Mark Haines | 2015-04-30 | 1 | -65/+76 |
| | | | | 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 | ||||
* | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-29 | 1 | -3/+4 |
|\ | | | | | | | | | Conflicts: synapse/config/homeserver.py | ||||
| * | Output vim style mode markers into the yaml config file | Mark Haines | 2015-04-28 | 1 | -3/+4 |
| | | |||||
* | | Add config for setting the perspective servers | Mark Haines | 2015-04-24 | 1 | -2/+2 |
| | | |||||
* | | Add a config file for perspective servers | Mark Haines | 2015-04-24 | 1 | -0/+11 |
|/ | |||||
* | Add a cache for get_event | Mark Haines | 2015-02-11 | 1 | -0/+10 |
| | |||||
* | Convert directory paths to absolute paths before daemonizing | Mark Haines | 2015-02-09 | 1 | -2/+3 |
| | |||||
* | Update copyright notices | Mark Haines | 2015-01-06 | 1 | -1/+1 |
| | |||||
* | Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse into develop | Erik Johnston | 2014-12-13 | 1 | -2/+2 |
|\ | |||||
| * | Fix bug while generating the error message when a file path specified in the ↵ | Erik Johnston | 2014-12-13 | 1 | -2/+2 |
| | | | | | | | | config doesn't exist | ||||
* | | Get uploads working with new media repo | Mark Haines | 2014-12-02 | 1 | -0/+14 |
|/ | |||||
* | Be more helpful and tell the user how to generate a config too. | David Baker | 2014-11-14 | 1 | -1/+4 |
| | |||||
* | Adding --generate-config will not help if the user has not specified a ↵ | David Baker | 2014-11-14 | 1 | -1/+1 |
| | | | | config file. | ||||
* | Fix pep8 warnings | Mark Haines | 2014-10-30 | 1 | -6/+13 |
| | |||||
* | Fix ncorrect ports in documentation and add notes on how generate-config ↵ | David Baker | 2014-10-02 | 1 | -1/+2 |
| | | | | | | also generates certs bound to whatever hostname you give with --generate-config. SYN-87 #resolved | ||||
* | Update README setup instructions to be correct. Make synapse spit out ↵ | David Baker | 2014-10-02 | 1 | -0/+1 |
| | | | | explanatory note when generating config to tell people to look at it and customise it. | ||||
* | Added a TODO note about YAML modeline for editors | Paul "LeoNerd" Evans | 2014-09-03 | 1 | -0/+3 |
| | |||||
* | fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵ | Matthew Hodgson | 2014-09-03 | 1 | -1/+1 |
| | | | | hasn't been incorporated in time for launch. | ||||
* | Add copyright notices and fix pyflakes errors | Mark Haines | 2014-09-03 | 1 | -2/+0 |
| | |||||
* | os.makedirs is almost but not entirely unlike mkdir -p | Mark Haines | 2014-09-02 | 1 | -1/+2 |
| | |||||
* | Make the config directory if the directory doesn't exisit when generating config | Mark Haines | 2014-09-02 | 1 | -0/+1 |
| | |||||
* | More helpful error messages for missing config | Mark Haines | 2014-09-02 | 1 | -2/+23 |
| | |||||
* | Use yaml for config file | Mark Haines | 2014-09-01 | 1 | -11/+6 |
| | |||||
* | Fix homeserver config parsing | Mark Haines | 2014-09-01 | 1 | -5/+18 |
| | |||||
* | Add config tree to synapse. Add support for reading config from a file | Mark Haines | 2014-08-31 | 1 | -0/+99 |