Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #170 from matrix-org/markjh/SYT-8-recaptcha | Mark Haines | 2015-05-29 | 1 | -0/+4 |
|\ | | | | | Allow endpoint for verifying recaptcha to be configured | ||||
| * | Merge branch 'develop' into markjh/SYT-8-recaptcha | Mark Haines | 2015-05-29 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Conflicts: synapse/handlers/auth.py | ||||
| * | | Add config for setting the recaptcha verify api endpoint, so we can test it ↵ | Mark Haines | 2015-05-29 | 1 | -0/+4 |
| | | | | | | | | | | | | in sytest | ||||
* | | | Add config option to turn off freezing events. Use new encode_json api and ↵ | Erik Johnston | 2015-05-29 | 1 | -0/+1 |
| |/ |/| | | | | | ujson.loads | ||||
* | | Registration should be disabled by default | Erik Johnston | 2015-05-28 | 1 | -1/+1 |
|/ | |||||
* | s/metric_interface/metric_bind_host/ | Erik Johnston | 2015-05-22 | 1 | -3/+3 |
| | |||||
* | Enable changing the interface the metrics listener binds to | Erik Johnston | 2015-05-22 | 1 | -1/+5 |
| | |||||
* | 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 |
|/ | |||||
* | Use the daemonize key from the config if it exists | Mark Haines | 2015-05-01 | 1 | -1/+4 |
| | |||||
* | Allow generate-config to run against an existing config file to generate ↵ | Mark Haines | 2015-05-01 | 3 | -14/+26 |
| | | | | default keys | ||||
* | Allow "manhole" to be ommited from the config | Mark Haines | 2015-04-30 | 1 | -1/+1 |
| | |||||
* | Remove the ~, comment the lines instead | Mark Haines | 2015-04-30 | 2 | -2/+2 |
| | |||||
* | Update key.py | Mark Haines | 2015-04-30 | 1 | -1/+2 |
| | |||||
* | Update metrics.py | Mark Haines | 2015-04-30 | 1 | -2/+2 |
| | |||||
* | Merge branch 'develop' into markjh/config_cleanup | Mark Haines | 2015-04-30 | 1 | -0/+1 |
|\ | | | | | | | | | Conflicts: synapse/config/captcha.py | ||||
| * | Undo changes to logger config, ie. remove the access_log_file option: ↵ | David Baker | 2015-04-30 | 1 | -16/+0 |
| | | | | | | | | decision is to support this through log_config rather tan adding an option. | ||||
| * | Do access log using python's logging stuff, just under a separate logger name | David Baker | 2015-04-30 | 1 | -0/+11 |
| | | |||||
| * | Add an access_log | David Baker | 2015-04-30 | 2 | -0/+7 |
| | | | | | | | | SYN-161 #resolve | ||||
* | | Write a default log_config when generating config | Mark Haines | 2015-04-30 | 4 | -4/+57 |
| | | |||||
* | | Don't break when sizes or durations are given as integers | Mark Haines | 2015-04-30 | 1 | -9/+12 |
| | | |||||
* | | Add a random string to the auto generated key id | Mark Haines | 2015-04-30 | 1 | -1/+3 |
| | | |||||
* | | Allow --enable-registration to be passed on the commandline | Mark Haines | 2015-04-30 | 1 | -3/+16 |
| | | |||||
* | | Use disable_registration keys if they are present | Mark Haines | 2015-04-30 | 1 | -0/+5 |
| | | |||||
* | | Allow multiple config files, set up a default config before applying the ↵ | Mark Haines | 2015-04-30 | 2 | -22/+38 |
| | | | | | | | | config files | ||||
* | | remove duplicate parse_size method | Mark Haines | 2015-04-30 | 1 | -9/+0 |
| | | |||||
* | | Manually generate the default config yaml, remove most of the commandline ↵ | Mark Haines | 2015-04-30 | 14 | -459/+442 |
|/ | | | | 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 | 6 | -50/+40 |
|\ | | | | | | | | | Conflicts: synapse/config/homeserver.py | ||||
| * | Delete ugly commented out log line. | Mark Haines | 2015-04-29 | 1 | -1/+0 |
| | | |||||
| * | comment out ugly test logline | Matthew Hodgson | 2015-04-29 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-28 | 4 | -48/+11 |
| |\ | |||||
| | * | Merge pull request #126 from matrix-org/csauth | Mark Haines | 2015-04-28 | 3 | -45/+7 |
| | |\ | | | | | | | | | Client / Server Auth Refactor | ||||
| | | * | Remove now-redundant email config | David Baker | 2015-04-23 | 2 | -44/+1 |
| | | | | |||||
| | | * | Merge branch 'develop' into csauth | David Baker | 2015-04-17 | 4 | -12/+44 |
| | | |\ | |||||
| | | * | | New registration for C/S API v2. Only ReCAPTCHA working currently. | David Baker | 2015-03-30 | 1 | -1/+6 |
| | | | | | |||||
| | * | | | Output vim style mode markers into the yaml config file | Mark Haines | 2015-04-28 | 1 | -3/+4 |
| | | | | | |||||
| * | | | | Move database configuration into config module | Erik Johnston | 2015-04-27 | 1 | -2/+21 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-27 | 1 | -0/+1 |
| |\| | | | |||||
| * | | | | Update --database-path metavar to SQLITE_DATABASE_PATH | Erik Johnston | 2015-04-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-15 | 1 | -1/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into mysql | Erik Johnston | 2015-04-07 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into mysql | Erik Johnston | 2015-04-07 | 3 | -12/+44 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into mysql | Erik Johnston | 2015-03-20 | 2 | -4/+33 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Make database selection configurable | Erik Johnston | 2015-03-20 | 1 | -0/+9 |
| | | | | | | | |||||
* | | | | | | | Add config for setting the perspective servers | Mark Haines | 2015-04-24 | 2 | -4/+22 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Fix spelling | Mark Haines | 2015-04-24 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'develop' into key_distribution | Mark Haines | 2015-04-24 | 1 | -0/+1 |
|\| | | | | | | |||||
| * | | | | | | Call the super classes when generating config | Mark Haines | 2015-04-24 | 1 | -0/+1 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Update syutil version to 0.0.4 | Mark Haines | 2015-04-14 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Add a config file for perspective servers | Mark Haines | 2015-04-24 | 2 | -0/+30 |
| | | | | | |||||
* | | | | | Move the key related config parser into a separate file | Mark Haines | 2015-04-24 | 3 | -85/+113 |
| | | | | | |||||
* | | | | | Better help for the old-signing-key option | Mark Haines | 2015-04-24 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | Implement remote key lookup api | Mark Haines | 2015-04-22 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Add a version 2 of the key server api | Mark Haines | 2015-04-14 | 1 | -1/+33 |
|/ / / / | |||||
* | | / | Fix --enable-registration flag to work if you don't give a value | Erik Johnston | 2015-04-07 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Add AppServiceConfig | Kegan Dougal | 2015-03-31 | 2 | -1/+33 |
| | | | |||||
* | | | turn --disable-registration into --enable-registration, given the default is ↵ | Matthew Hodgson | 2015-03-30 | 1 | -11/+11 |
| |/ |/| | | | | | for registration to be disabled by default now. this is backwards incompatible by removing the old --disable-registration arg, but makes for a much more intuitive arg | ||||
* | | Merge pull request #109 from matrix-org/default_registration | Erik Johnston | 2015-03-18 | 1 | -3/+30 |
|\ \ | | | | | | | Disable registration by default. Add script to register new users. | ||||
| * | | Comment. | Erik Johnston | 2015-03-16 | 1 | -0/+3 |
| | | | |||||
| * | | Allow enabling of registration with --disable-registration false | Erik Johnston | 2015-03-13 | 1 | -2/+8 |
| | | | |||||
| * | | PEP8 | Erik Johnston | 2015-03-13 | 1 | -1/+1 |
| | | | |||||
| * | | Implement registering with shared secret. | Erik Johnston | 2015-03-13 | 1 | -3/+17 |
| | | | |||||
| * | | Disable registration by default | Erik Johnston | 2015-03-13 | 1 | -0/+4 |
| | | | |||||
* | | | Wire up the webclient option | David Baker | 2015-03-17 | 1 | -1/+3 |
| |/ |/| | | | | | | | | | It existed but was hardcoded to True. Give it an underscore for consistency. Also don't pull in syweb unless we're actually using the web client. | ||||
* | | Option to serve metrics from their own localhost-only TCP port instead of ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -0/+5 |
| | | | | | | | | muxed on the main listener | ||||
* | | Commandline option to enable metrics system | Paul "LeoNerd" Evans | 2015-03-12 | 2 | -1/+34 |
|/ | |||||
* | Unused import | Erik Johnston | 2015-03-06 | 1 | -1/+1 |
| | |||||
* | Don't look for an TLS private key if we have set --no-tls | Erik Johnston | 2015-03-06 | 2 | -7/+13 |
| | |||||
* | Merge pull request #83 from matrix-org/nofile_limit_config | Erik Johnston | 2015-03-02 | 1 | -0/+7 |
|\ | | | | | Add config option to set the soft fd limit on start | ||||
| * | By default set soft limit to hard limit | Erik Johnston | 2015-02-20 | 1 | -5/+5 |
| | | |||||
| * | Add config option to set the soft fd limit on start | Erik Johnston | 2015-02-19 | 1 | -0/+7 |
| | | |||||
* | | Make the federation server ratelimiting configurable. | Erik Johnston | 2015-03-02 | 1 | -0/+36 |
| | | |||||
* | | turns uris config options should append since it's a list | David Baker | 2015-02-24 | 1 | -1/+1 |
| | | |||||
* | | Add config option to disable registration. | Erik Johnston | 2015-02-19 | 2 | -1/+35 |
|/ | |||||
* | Add a cache for get_event | Mark Haines | 2015-02-11 | 2 | -0/+15 |
| | |||||
* | yaml.load expects strings to be a yaml rather than file | Erik Johnston | 2015-02-10 | 1 | -1/+2 |
| | |||||
* | Use yaml logging config format because it is much nicer | Erik Johnston | 2015-02-10 | 1 | -1/+2 |
| | |||||
* | Convert directory paths to absolute paths before daemonizing | Mark Haines | 2015-02-09 | 1 | -2/+3 |
| | |||||
* | Allow ':memory:' as the database path for sqlite3 | Mark Haines | 2015-01-19 | 1 | -1/+4 |
| | |||||
* | SYN-142: Rotate logs if logging to file. Fixed to a 4 file rotate with ↵ | Kegan Dougal | 2015-01-08 | 1 | -1/+4 |
| | | | | 100MB/file for now. | ||||
* | Add better help message for --server-name config option. | Erik Johnston | 2015-01-08 | 1 | -2/+6 |
| | |||||
* | Increase default maximum attachment size to 10M | Mark Haines | 2015-01-06 | 1 | -1/+1 |
| | |||||
* | Update copyright notices | Mark Haines | 2015-01-06 | 12 | -12/+12 |
| | |||||
* | SYN-142: Use a default log file 'homeserver.log' so people get logging by ↵ | Kegan Dougal | 2014-12-16 | 1 | -1/+1 |
| | | | | default. | ||||
* | 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 | ||||
* | | Limit the size of images that are thumbnailed serverside. Limit the size of ↵ | Mark Haines | 2014-12-11 | 1 | -0/+5 |
| | | | | | | | | file that a server will download from a remote server | ||||
* | | Merge branch 'develop' into media_repository | Mark Haines | 2014-12-10 | 2 | -2/+11 |
|\| | |||||
| * | Don't log synapse.storage at DEBUG level when under -v; require -v -v for that | Paul "LeoNerd" Evans | 2014-12-02 | 1 | -0/+6 |
| | | |||||
| * | SYN-187: Set a more sensible default for the content_addr v0.5.3b | Mark Haines | 2014-12-02 | 1 | -2/+5 |
| | | |||||
* | | Get uploads working with new media repo | Mark Haines | 2014-12-02 | 2 | -0/+18 |
|/ | |||||
* | 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. | ||||
* | Merge branch 'develop' into request_logging | Mark Haines | 2014-11-14 | 1 | -0/+3 |
|\ | | | | | | | | | | | | | Conflicts: setup.py synapse/storage/_base.py synapse/util/async.py | ||||
| * | Add option to not bind to HTTPS port. This is useful if running behind an ↵ | Erik Johnston | 2014-11-03 | 1 | -0/+3 |
| | | | | | | | | ssl load balancer | ||||
* | | Merge branch 'develop' into request_logging | Mark Haines | 2014-10-30 | 8 | -12/+27 |
|\| | | | | | | | | | Conflicts: synapse/config/logger.py | ||||
| * | Fix pep8 warnings | Mark Haines | 2014-10-30 | 9 | -13/+29 |
| | | |||||
* | | Pep8 and a few doc strings | Mark Haines | 2014-10-30 | 1 | -3/+3 |
| | | |||||
* | | Add a request-id to each log line | Mark Haines | 2014-10-30 | 1 | -7/+16 |
|/ | |||||
* | Fix pyflakes warnings | Mark Haines | 2014-10-27 | 1 | -1/+1 |
| | |||||
* | Fix auto generating signing_keys | Mark Haines | 2014-10-18 | 1 | -1/+1 |
| | |||||
* | Merge branch develop into server2server_signing | Mark Haines | 2014-10-13 | 1 | -0/+2 |
|\ | | | | | | | | | Conflicts: synapse/app/homeserver.py | ||||
| * | Merge branch 'master' into develop | David Baker | 2014-10-02 | 1 | -1/+2 |
| |\ | |||||
| | * | 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 | ||||
| * | | Merge remote-tracking branch 'origin/master' into develop | Mark Haines | 2014-10-02 | 1 | -0/+1 |
| |\| | |||||
| | * | 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. | ||||
* | | | Merge branch 'develop' into server2server_signing | Mark Haines | 2014-09-30 | 4 | -3/+49 |
|\| | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py tests/rest/test_presence.py | ||||
| * | | pyflakes cleanup | Erik Johnston | 2014-09-30 | 1 | -1/+0 |
| |/ | |||||
| * | Just use a yaml list for turn servers | David Baker | 2014-09-25 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'turn' into develop | David Baker | 2014-09-25 | 2 | -1/+43 |
| |\ | |||||
| | * | Make turn server endpoint return an empty object if no turn servers to | David Baker | 2014-09-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | match the normal response. Don't break if the turn_uris option isn't present. | ||||
| | * | rename endpoint to better reflect what it is and allow specifying multiple uris | David Baker | 2014-09-24 | 1 | -3/+3 |
| | | | |||||
| | * | Add support for TURN servers as per the TURN REST API ↵ | David Baker | 2014-09-23 | 2 | -1/+43 |
| | | | | | | | | | | | | (http://tools.ietf.org/html/draft-uberti-behave-turn-rest-00) | ||||
| * | | Allow a (hidden undocumented) key to m.login.recaptcha to specify a shared ↵ | Paul "LeoNerd" Evans | 2014-09-23 | 1 | -1/+6 |
| |/ | | | | | | | secret to allow bots to bypass the ReCAPTCHA test (SYN-60) | ||||
* / | Read signing keys using methods from syutil. convert keys that are in the ↵ | Mark Haines | 2014-09-23 | 1 | -9/+30 |
|/ | | | | wrong format | ||||
* | formatting | Kegan Dougal | 2014-09-19 | 1 | -5/+9 |
| | |||||
* | Added support for the HS to send emails. Use it to send password resets. ↵ | Kegan Dougal | 2014-09-16 | 2 | -2/+45 |
| | | | | Added email_smtp_server and email_from_address config args. Added emailutils. | ||||
* | Add config opion for XFF headers when performing ReCaptcha auth. | Kegan Dougal | 2014-09-05 | 1 | -0/+6 |
| | |||||
* | Added a captcha config to the HS, to enable registration captcha checking ↵ | Kegan Dougal | 2014-09-05 | 2 | -1/+38 |
| | | | | and for the recaptcha private key. | ||||
* | Added a TODO note about YAML modeline for editors | Paul "LeoNerd" Evans | 2014-09-03 | 1 | -0/+3 |
| | |||||
* | Default PID file should be 'homeserver.pid' to match the other ↵ | Paul "LeoNerd" Evans | 2014-09-03 | 1 | -1/+1 |
| | | | | 'homeserver.*' naming convention | ||||
* | fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵ | Matthew Hodgson | 2014-09-03 | 8 | -8/+8 |
| | | | | hasn't been incorporated in time for launch. | ||||
* | Limit the size of uploads | Mark Haines | 2014-09-03 | 2 | -1/+41 |
| | |||||
* | Add option to change content repo location | Erik Johnston | 2014-09-03 | 1 | -0/+12 |
| | |||||
* | Add copyright notices and fix pyflakes errors | Mark Haines | 2014-09-03 | 2 | -2/+14 |
| | |||||
* | rate limiting for message sending | Mark Haines | 2014-09-02 | 1 | -2/+2 |
| | |||||
* | Add ratelimiting config | Mark Haines | 2014-09-02 | 1 | -0/+21 |
| | |||||
* | Add ratelimiting function to basehandler | Mark Haines | 2014-09-02 | 1 | -1/+3 |
| | |||||
* | Remove option for disabling webclient because it was confusing | Mark Haines | 2014-09-02 | 1 | -4/+1 |
| | |||||
* | Default HTTP and HTTPS ports to 8008 and 8448 | Erik Johnston | 2014-09-02 | 1 | -2/+4 |
| | |||||
* | os.makedirs is almost but not entirely unlike mkdir -p | Mark Haines | 2014-09-02 | 1 | -1/+2 |
| | |||||
* | Fix typo when reading TLS config | Mark Haines | 2014-09-02 | 1 | -1/+1 |
| | |||||
* | 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 | 3 | -6/+29 |
| | |||||
* | Add unsecure listener port to homeserver | Mark Haines | 2014-09-01 | 1 | -2/+5 |
| | |||||
* | specify metavars in argparse | Matthew Hodgson | 2014-09-01 | 1 | -2/+3 |
| | |||||
* | Use yaml for config file | Mark Haines | 2014-09-01 | 1 | -11/+6 |
| | |||||
* | Use pregenerated DH params when generating config | Mark Haines | 2014-09-01 | 1 | -7/+29 |
| | |||||
* | Listen using SSL | Mark Haines | 2014-09-01 | 1 | -1/+1 |
| | |||||
* | Fix homeserver config parsing | Mark Haines | 2014-09-01 | 5 | -20/+35 |
| | |||||
* | Add config tree to synapse. Add support for reading config from a file | Mark Haines | 2014-08-31 | 7 | -0/+423 |