Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Infer no_tls from presence of TLS listeners | Richard van der Hoff | 2019-02-11 | 1 | -3/+20 |
| | | | | | Rather than have to specify `no_tls` explicitly, infer whether we need to load the TLS keys etc from whether we have any TLS-enabled listeners. | ||||
* | Fail cleanly if listener config lacks a 'port' | Richard van der Hoff | 2019-02-11 | 1 | -0/+5 |
| | | | | ... otherwise we would fail with a mysterious KeyError or something later. | ||||
* | Clean up default listener configuration (#4586) | Richard van der Hoff | 2019-02-11 | 1 | -48/+81 |
| | | | | | | | | | | Rearrange the comments to try to clarify them, and expand on what some of it means. Use a sensible default 'bind_addresses' setting. For the insecure port, only bind to localhost, and enable x_forwarded, since apparently it's for use behind a load-balancer. | ||||
* | Merge pull request #4420 from matrix-org/jaywink/openid-listener | Erik Johnston | 2019-02-11 | 1 | -0/+10 |
|\ | | | | | New listener resource for the federation API "openid/userinfo" endpoint | ||||
| * | Fix flake8 issues | Jason Robinson | 2019-01-23 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | Remove openid resource from default config | Jason Robinson | 2019-01-23 | 1 | -4/+13 |
| | | | | | | | | | | | | Instead document it commented out. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
| * | Split federation OpenID userinfo endpoint out of the federation resource | Jason Robinson | 2019-01-23 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the OpenID userinfo endpoint to be active even if the federation resource is not active. The OpenID userinfo endpoint is called by integration managers to verify user actions using the client API OpenID access token. Without this verification, the integration manager cannot know that the access token is valid. The OpenID userinfo endpoint will be loaded in the case that either "federation" or "openid" resource is defined. The new "openid" resource is defaulted to active in default configuration. Signed-off-by: Jason Robinson <jasonr@matrix.org> | ||||
* | | Don't recommend :8448 to people on public_baseurl | Travis Ralston | 2019-01-28 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_check | Neil Johnson | 2019-01-24 | 1 | -5/+4 |
|\ \ | | | | | | | Neilj/fix threepid auth check | ||||
| * | | move guard out of is_threepid_reserved and into register.py | Neil Johnson | 2019-01-22 | 1 | -2/+0 |
| | | | |||||
| * | | Fix None guard in config.server.is_threepid_reserved | Neil Johnson | 2019-01-22 | 1 | -5/+6 |
| |/ | |||||
* / | Clarify docs for public_baseurl | David Baker | 2019-01-24 | 1 | -1/+5 |
|/ | | | | | | This is leading to problems with people upgrading to clients that support MSC1730 because people have this misconfigured, so try to make the docs completely unambiguous. | ||||
* | Check jinja version for consent resource (#4327) | Richard van der Hoff | 2019-01-07 | 1 | -1/+37 |
| | | | | | | | | * Raise a ConfigError if an invalid resource is specified * Require Jinja 2.9 for the consent resource * changelog | ||||
* | Add a script to generate a clean config file (#4315) | Richard van der Hoff | 2018-12-22 | 1 | -2/+3 |
| | |||||
* | Fix indentation in default config (#4313) | Richard van der Hoff | 2018-12-22 | 1 | -35/+35 |
| | | | These settings are not supposed to be under 'listeners'. | ||||
* | Stop installing Matrix Console by default | Richard van der Hoff | 2018-12-11 | 1 | -15/+27 |
| | | | | This is based on the work done by @krombel in #2601. | ||||
* | Add an option to disable search for homeservers which may not be interested ↵ | Travis Ralston | 2018-12-04 | 1 | -1/+11 |
| | | | | | | in it (#4230) This is useful for homeservers not intended for users, such as bot-only homeservers or ones that only process IoT data. | ||||
* | Add option to track MAU stats (but not limit people) (#3830) | Travis Ralston | 2018-11-15 | 1 | -0/+6 |
| | |||||
* | move threepid checker to config, add missing yields | Neil Johnson | 2018-08-31 | 1 | -0/+17 |
| | |||||
* | Change admin_uri to admin_contact in config and errors | Erik Johnston | 2018-08-24 | 1 | -2/+2 |
| | |||||
* | Implement trail users | Erik Johnston | 2018-08-23 | 1 | -0/+6 |
| | |||||
* | Integrate presence from hotfixes (#3694) | Amber Brown | 2018-08-18 | 1 | -0/+6 |
| | |||||
* | server limits config docs | Neil Johnson | 2018-08-17 | 1 | -0/+26 |
| | |||||
* | add new error type ResourceLimit | Neil Johnson | 2018-08-16 | 1 | -0/+1 |
| | |||||
* | update admin email to uri | Neil Johnson | 2018-08-15 | 1 | -1/+1 |
| | |||||
* | replace admin_email with admin_uri for greater flexibility | Neil Johnson | 2018-08-15 | 1 | -1/+1 |
| | |||||
* | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 1 | -0/+4 |
| | | | | AuthError in all cases | ||||
* | Revert "support admin_email config and pass through into blocking errors, ↵ | Neil Johnson | 2018-08-13 | 1 | -4/+0 |
| | | | | | | return AuthError in all cases" This reverts commit 0d43f991a19840a224d3dac78d79f13d78212ee6. | ||||
* | support admin_email config and pass through into blocking errors, return ↵ | Neil Johnson | 2018-08-13 | 1 | -0/+4 |
| | | | | AuthError in all cases | ||||
* | Merge branch 'develop' into neilj/disable_hs | Neil Johnson | 2018-08-08 | 1 | -0/+3 |
|\ | |||||
| * | implement reserved users for mau limits | Neil Johnson | 2018-08-07 | 1 | -1/+1 |
| | | |||||
| * | load mau limit threepids | Neil Johnson | 2018-08-06 | 1 | -0/+3 |
| | | |||||
* | | disable HS from config | Neil Johnson | 2018-08-04 | 1 | -0/+4 |
|/ | |||||
* | fix (lots of) py3 test failures | Neil Johnson | 2018-08-03 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' into develop | Richard van der Hoff | 2018-08-02 | 1 | -0/+2 |
|\ | |||||
| * | Merge pull request #3377 from Valodim/note-affinity | Richard van der Hoff | 2018-07-19 | 1 | -0/+2 |
| |\ | | | | | | | document that the affinity package is required for the cpu_affinity setting | ||||
| | * | add note that the affinity package is required for the cpu_affinity setting | Vincent Breitmoser | 2018-06-09 | 1 | -0/+2 |
| | | | |||||
* | | | remove need to plot limit_usage_by_mau | Neil Johnson | 2018-08-01 | 1 | -3/+6 |
| | | | |||||
* | | | coding style | Neil Johnson | 2018-07-31 | 1 | -1/+1 |
| | | | |||||
* | | | limit register and sign in on number of monthly users | Neil Johnson | 2018-07-30 | 1 | -0/+5 |
|/ / | |||||
* | | run isort | Amber Brown | 2018-07-09 | 1 | -0/+1 |
| | | |||||
* | | More server_name validation | Richard van der Hoff | 2018-07-04 | 1 | -2/+9 |
|/ | | | | | | | | 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. | ||||
* | Run Prometheus on a different port, optionally. (#3274) | Amber Brown | 2018-05-31 | 1 | -0/+10 |
| | |||||
* | Add federation_domain_whitelist option (#2820) | Matthew Hodgson | 2018-01-22 | 1 | -0/+22 |
| | | | | | | 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 | ||||
* | Allow binds to both :: and 0.0.0.0 | Silke Hofstra | 2017-12-17 | 1 | -5/+3 |
| | | | | | | | | | | 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> | ||||
* | Adapt the default config to bind on IPv6. | Willem Mulder | 2017-12-17 | 1 | -8/+9 |
| | | | | | | | | | 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> | ||||
* | Add config option to disable media_repo on main synapse | Richard van der Hoff | 2017-11-22 | 1 | -0/+6 |
| | | | | ... to stop us doing the cache cleanup jobs on the master. | ||||
* | Add a hook for custom rest endpoints | Richard van der Hoff | 2017-11-02 | 1 | -0/+7 |
| | | | | | Let the user specify custom modules which can be used for implementing extra endpoints. | ||||
* | replace 'except:' with 'except Exception:' | Richard van der Hoff | 2017-10-23 | 1 | -1/+1 |
| | | | | what could possibly go wrong | ||||
* | Add a config option to block all room invites (#2457) | Richard van der Hoff | 2017-09-19 | 1 | -0/+10 |
| | | | | | - allows sysadmins the ability to lock down their servers so that people can't send their users room invites. | ||||
* | Fix process startup | Richard van der Hoff | 2017-08-16 | 1 | -10/+13 |
| | | | | escape the % that got added in 92168cb so that the process starts up ok. | ||||
* | explain why CPU affinity is a good idea | Matthew Hodgson | 2017-08-15 | 1 | -0/+8 |
| | |||||
* | Allow configuration of CPU affinity | Richard van der Hoff | 2017-08-15 | 1 | -0/+12 |
| | | | | | 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. | ||||
* | Initial worker impl | Erik Johnston | 2017-06-16 | 1 | -0/+4 |
| | |||||
* | Configurable maximum number of events requested by /sync and /messages (#2220) | Pablo Saavedra | 2017-05-13 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | web_server_root documentation fix | Matthew Wolff | 2017-04-17 | 1 | -0/+6 |
| | | | | Signed-off-by: Matthew Wolff <matthewjwolff@gmail.com> | ||||
* | Pop bind_address | Erik Johnston | 2017-01-10 | 1 | -1/+1 |
| | |||||
* | Restore default bind address | Erik Johnston | 2017-01-10 | 1 | -4/+13 |
| | |||||
* | Add IPv6 comment to default config | Johannes Löthberg | 2016-12-18 | 1 | -0/+4 |
| | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
* | Make default homeserver config use bind_addresses | Johannes Löthberg | 2016-12-18 | 1 | -4/+5 |
| | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> | ||||
* | Hook up the send queue and create a federation sender worker | Erik Johnston | 2016-11-16 | 1 | -0/+5 |
| | |||||
* | Remove support for aggregate room lists | Erik Johnston | 2016-09-15 | 1 | -9/+0 |
| | |||||
* | remove vector.im from default secondary DS list | Matthew Hodgson | 2016-06-27 | 1 | -1/+0 |
| | |||||
* | Remove the legacy v0 content upload API. | Mark Haines | 2016-06-21 | 1 | -20/+0 |
| | | | | | | 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. | ||||
* | Turn use_frozen_events off by default | Erik Johnston | 2016-06-17 | 1 | -1/+1 |
| | |||||
* | Inline the synchrotron and pusher configs into the main config | Mark Haines | 2016-06-16 | 1 | -13/+18 |
| | |||||
* | Allow setting of gc.set_thresholds | Erik Johnston | 2016-06-07 | 1 | -1/+18 |
| | |||||
* | Add vector.im to default secondary_directory_servers and add comment ↵ | David Baker | 2016-05-31 | 1 | -0/+4 |
| | | | | explaining it's not a permanent solution | ||||
* | Add federation room list servlet | David Baker | 2016-05-31 | 1 | -0/+6 |
| | |||||
* | Correct public_baseurl default | David Baker | 2016-04-29 | 1 | -2/+2 |
| | |||||
* | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 1 | -0/+1 |
|\ | |||||
| * | Optionally split out the pushers into a separate process | Mark Haines | 2016-04-21 | 1 | -0/+1 |
| | | |||||
* | | Hopefully all remaining bits for email notifs | David Baker | 2016-04-27 | 1 | -0/+8 |
|/ | | | | Add public facing base url to the server so synapse knows what URL to use when converting mxc to http urls for use in emails | ||||
* | Merge pull request #473 from matrix-org/erikj/ssh_manhole | Erik Johnston | 2016-01-07 | 1 | -1/+1 |
|\ | | | | | Change manhole to use ssh | ||||
| * | s/telnet/ssh/ | Erik Johnston | 2016-01-07 | 1 | -1/+1 |
| | | |||||
* | | copyrights | Matthew Hodgson | 2016-01-07 | 1 | -1/+1 |
|/ | |||||
* | Added a single line to explain what the server_name is used for | Mads R. Christensen | 2015-12-02 | 1 | -0/+1 |
| | |||||
* | Preserve version string in user agent | Daniel Wagner-Hall | 2015-10-05 | 1 | -1/+1 |
| | |||||
* | Allow synapse's useragent to be customized | Daniel Wagner-Hall | 2015-10-02 | 1 | -0/+1 |
| | | | | | This will allow me to write tests which verify which server made HTTP requests in a federation context. | ||||
* | Implement configurable stats reporting | Daniel Wagner-Hall | 2015-09-22 | 1 | -1/+1 |
| | | | | | | | | | | 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. | ||||
* | Allow specifying a directory to host a web client from | Erik Johnston | 2015-08-25 | 1 | -0/+1 |
| | |||||
* | Only print the pidfile path on startup if requested by a commandline flag | Paul "LeoNerd" Evans | 2015-08-07 | 1 | -0/+7 |
| | |||||
* | Remove redundant newline | Erik Johnston | 2015-06-15 | 1 | -2/+1 |
| | |||||
* | Document listener config. Remove deprecated config options | Erik Johnston | 2015-06-15 | 1 | -28/+42 |
| | |||||
* | Add backwards compat support for metrics, manhole and webclient config options | Erik Johnston | 2015-06-12 | 1 | -3/+27 |
| | |||||
* | Correctly handle x_forwaded listener option | Erik Johnston | 2015-06-12 | 1 | -0/+2 |
| | |||||
* | Use config.listeners | Erik Johnston | 2015-06-12 | 1 | -30/+84 |
| | |||||
* | Begin changing the config format | Erik Johnston | 2015-06-11 | 1 | -8/+24 |
| | |||||
* | Add config option to disable compression of http responses | Erik Johnston | 2015-06-01 | 1 | -0/+6 |
| | |||||
* | Add config option to turn off freezing events. Use new encode_json api and ↵ | Erik Johnston | 2015-05-29 | 1 | -0/+1 |
| | | | | ujson.loads | ||||
* | Use the daemonize key from the config if it exists | Mark Haines | 2015-05-01 | 1 | -1/+4 |
| | |||||
* | 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 | 1 | -1/+1 |
| | |||||
* | Manually generate the default config yaml, remove most of the commandline ↵ | Mark Haines | 2015-04-30 | 1 | -48/+69 |
| | | | | 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 | ||||
* | Move the key related config parser into a separate file | Mark Haines | 2015-04-24 | 1 | -84/+1 |
| | |||||
* | 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 |
| | |||||
* | 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. | ||||
* | Don't look for an TLS private key if we have set --no-tls | Erik Johnston | 2015-03-06 | 1 | -3/+0 |
| | |||||
* | 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 |
| | |||||
* | Add better help message for --server-name config option. | Erik Johnston | 2015-01-08 | 1 | -2/+6 |
| | |||||
* | Update copyright notices | Mark Haines | 2015-01-06 | 1 | -1/+1 |
| | |||||
* | SYN-187: Set a more sensible default for the content_addr v0.5.3b | Mark Haines | 2014-12-02 | 1 | -2/+5 |
| | |||||
* | 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 | ||||
* | Fix pep8 warnings | Mark Haines | 2014-10-30 | 1 | -1/+1 |
| | |||||
* | Fix pyflakes warnings | Mark Haines | 2014-10-27 | 1 | -1/+1 |
| | |||||
* | Fix auto generating signing_keys | Mark Haines | 2014-10-18 | 1 | -1/+1 |
| | |||||
* | Read signing keys using methods from syutil. convert keys that are in the ↵ | Mark Haines | 2014-09-23 | 1 | -9/+30 |
| | | | | wrong format | ||||
* | 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 | 1 | -1/+1 |
| | | | | hasn't been incorporated in time for launch. | ||||
* | Add option to change content repo location | Erik Johnston | 2014-09-03 | 1 | -0/+12 |
| | |||||
* | 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 |
| | |||||
* | More helpful error messages for missing config | Mark Haines | 2014-09-02 | 1 | -1/+1 |
| | |||||
* | 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 |
| | |||||
* | Listen using SSL | Mark Haines | 2014-09-01 | 1 | -1/+1 |
| | |||||
* | Fix homeserver config parsing | Mark Haines | 2014-09-01 | 1 | -5/+6 |
| | |||||
* | Add config tree to synapse. Add support for reading config from a file | Mark Haines | 2014-08-31 | 1 | -0/+75 |