summary refs log tree commit diff
path: root/synapse/config (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Configurable maximum number of events requested by /sync and /messages (#2220)Pablo Saavedra2017-05-131-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 fixMatthew Wolff2017-04-171-0/+6
| | | | Signed-off-by: Matthew Wolff <matthewjwolff@gmail.com>
* trust a hypothetical future riot.im ISMatthew Hodgson2017-04-101-0/+1
|
* Merge pull request #2102 from DanielDent/add-auth-emailDavid Baker2017-04-101-0/+16
|\ | | | | Support authenticated SMTP
| * Support authenticated SMTPDaniel Dent2017-04-051-0/+16
| | | | | | | | | | | | Closes (SYN-714) #1385 Signed-off-by: Daniel Dent <matrixcontrib@contactdaniel.net>
* | Merge pull request #2097 from matrix-org/erikj/repl_tcp_clientErik Johnston2017-04-051-1/+3
|\ \ | |/ |/| Move to using TCP replication
| * Remove unused worker config optionErik Johnston2017-04-041-1/+0
| |
| * Update all the workers and master to use TCP replicationErik Johnston2017-04-031-0/+3
| |
* | typoMatthew Hodgson2017-03-151-1/+1
| |
* | set default for turn_allow_guests correctlyMatthew Hodgson2017-03-151-1/+1
| |
* | add setting (on by default) to support TURN for guestsMatthew Hodgson2017-03-151-0/+8
|/
* Add helpful texts to logger config optionsRichard van der Hoff2017-03-131-5/+7
|
* Merge pull request #1983 from matrix-org/rav/no_redirect_stdioRichard van der Hoff2017-03-131-6/+28
|\ | | | | Add an option to disable stdio redirect
| * Add an option to disable stdio redirectRichard van der Hoff2017-03-101-1/+12
| | | | | | | | This makes it tractable to run synapse under pdb.
| * Refactor logger config for workersRichard van der Hoff2017-03-101-5/+16
| | | | | | | | - to make it easier to add more config options.
* | Reread log config on SIGHUPRichard van der Hoff2017-03-101-10/+19
|/ | | | When we are using a log_config file, reread it on SIGHUP.
* Fix typo in config comments.Tyler Smith2017-02-111-1/+1
| | | | Signed-off-by: Tyler Smith <tylersmith.me@gmail.com>
* Merge pull request #1835 from matrix-org/erikj/fix_workersErik Johnston2017-01-201-0/+10
|\ | | | | Make worker listener config backwards compat
| * Make worker listener config backwards compatErik Johnston2017-01-201-0/+10
| |
* | Added default config for turn username and passwordMarvin Steadfast2017-01-191-0/+5
| |
* | Added username and password for turn serverMarvin Steadfast2017-01-191-1/+3
|/ | | | | It makes it possible to use a turn server that needs a username and password instead of a token.
* Allow configuring the Riot URL used in notification emailsAdrian Perez de Castro2017-01-131-0/+7
| | | | | | | | | | The URLs used for notification emails were hardcoded to use either matrix.to or vector.im; but for self-hosted setups where Riot is also self-hosted it may be desirable to allow configuring an alternative Riot URL. Fixes #1809. Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
* Merge pull request #1795 from matrix-org/erikj/port_defaultsErik Johnston2017-01-131-4/+13
|\ | | | | Restore default bind address
| * Pop bind_addressErik Johnston2017-01-101-1/+1
| |
| * Restore default bind addressErik Johnston2017-01-101-4/+13
| |
* | Remove full_twisted_stacktraces optionErik Johnston2017-01-121-8/+0
|/ | | | | | | | | | | | | | | | | The debug 'full_twisted_stacktraces' flag caused synapse to rewrite twisted deferreds to always fire the callback on the next reactor tick. This was to force the deferred to always store the stacktraces on exceptions, and thus be more likely to have a full stacktrace when it reaches the final error handlers and gets printed to the logs. Dynamically rewriting things is generally bad, and in particular this change violates assumptions of various bits of Twisted. This wouldn't necessarily be so bad, but it turns out this option has been turned on on some production servers. Turning the option can cause e.g. #1778. For now, lets just entirely nuke this option.
* Merge remote-tracking branch 'origin/release-v0.18.6' into developMark Haines2016-12-301-3/+13
|\
| * Use the new twisted logging framework.Mark Haines2016-12-301-3/+13
| | | | | | | | | | Hopefully adding an observer to the new framework will avoid a memory leak https://twistedmatrix.com/trac/ticket/8164
* | Add IPv6 comment to default configJohannes Löthberg2016-12-181-0/+4
| | | | | | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
* | Make default homeserver config use bind_addressesJohannes Löthberg2016-12-181-4/+5
|/ | | | Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
* Bugfix: Console logging handler missing default filterpik2016-12-031-0/+1
|
* Stop putting a time caveat on access tokensRichard van der Hoff2016-11-291-6/+0
| | | | | | | | The 'time' caveat on the access tokens was something of a lie, since we weren't enforcing it; more pertinently its presence stops us ever adding useful time caveats. Let's move in the right direction by not lying in our caveats.
* Hook up the send queue and create a federation sender workerErik Johnston2016-11-161-0/+5
|
* Use external ldap auth pacakgeErik Johnston2016-11-151-7/+13
|
* Merge pull request #1625 from DanielDent/patch-1Erik Johnston2016-11-121-2/+3
|\ | | | | Add support for durations in minutes
| * Add support for durations in minutesDaniel Dent2016-11-121-2/+3
| |
* | Don't assume providers raise ConfigError'sErik Johnston2016-11-081-2/+7
| |
* | default config: blacklist more internal ipsEuan Kemp2016-11-061-0/+2
|/
* Allow Configurable Rate Limiting Per ASLuke Barnard2016-10-181-0/+6
| | | | This adds a flag loaded from the registration file of an AS that will determine whether or not its users are rate limited (by ratelimit in _base.py). Needed for IRC bridge reasons - see https://github.com/matrix-org/matrix-appservice-irc/issues/240.
* Merge pull request #1167 from matrix-org/markjh/fingerprintsMark Haines2016-10-121-0/+38
|\ | | | | Add config option for adding additional TLS fingerprints
| * Explain how long the servers can cache the TLS fingerprints forMark Haines2016-10-121-3/+4
| |
| * Improve comment formattingMark Haines2016-10-121-1/+1
| |
| * Add config option for adding additional TLS fingerprintsMark Haines2016-10-111-0/+37
| |
* | Implement pluggable password authErik Johnston2016-10-033-103/+64
|/ | | | | | Allows delegating the password auth to an external module. This also moves the LDAP auth to using this system, allowing it to be removed from the synapse tree entirely in the future.
* Remove support for aggregate room listsErik Johnston2016-09-151-9/+0
|
* flake8Kegan Dougal2016-08-301-2/+3
|
* Use None instead of the empty stringKegan Dougal2016-08-301-4/+11
| | | | Change how we validate the 'url' field as a result.
* Flake8Kegan Dougal2016-08-301-1/+2
|
* Allow application services to have an optional 'url'Kegan Dougal2016-08-301-0/+6
| | | | | | If 'url' is not specified, they will not be pushed for events or queries. This is useful for bots who simply wish to reserve large chunks of user/alias namespace, and don't care about being pushed for events.
* Merge pull request #1026 from matrix-org/paul/thirdpartylookupPaul Evans2016-08-181-0/+10
|\ | | | | 3rd party entity lookup
| * Filter 3PU lookups by only ASes that declare knowledge of that protocolPaul "LeoNerd" Evans2016-08-181-0/+10
| |
* | Add appservice workerErik Johnston2016-08-181-0/+1
|/
* Update password config commentKent Shikama2016-07-061-1/+1
| | | | Signed-off-by: Kent Shikama <kent@kentshikama.com>
* Remove default password pepper stringKent Shikama2016-07-051-2/+1
|
* Fix password configKent Shikama2016-07-051-1/+1
|
* Fix pep8Kent Shikama2016-07-051-1/+1
|
* Add comment to prompt changing of pepperKent Shikama2016-07-051-0/+1
|
* Add pepper to password hashingKent Shikama2016-07-051-1/+5
| | | | Signed-off-by: Kent Shikama <kent@kentshikama.com>
* remove vector.im from default secondary DS listMatthew Hodgson2016-06-271-1/+0
|
* Merge branch 'master' into developMark Haines2016-06-231-0/+1
|\
| * Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse v0.16.1Erik Johnston2016-06-205-107/+210
| |\
| * | point to the CAPTCHA docsMatthew Hodgson2016-06-121-0/+1
| | |
* | | Rework ldap integration with ldap3Martin Weinelt2016-06-221-27/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the pure-python ldap3 library, which eliminates the need for a system dependency. Offer both a `search` and `simple_bind` mode, for more sophisticated ldap scenarios. - `search` tries to find a matching DN within the `user_base` while employing the `user_filter`, then tries the bind when a single matching DN was found. - `simple_bind` tries the bind against a specific DN by combining the localpart and `user_base` Offer support for STARTTLS on a plain connection. The configuration was changed to reflect these new possibilities. Signed-off-by: Martin Weinelt <hexa@darmstadt.ccc.de>
* | | Remove the legacy v0 content upload API.Mark Haines2016-06-211-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 defaultErik Johnston2016-06-171-1/+1
| |
* | Use worker_ prefixes for worker config, use existing support for multiple ↵Mark Haines2016-06-161-41/+8
| | | | | | | | config files
* | Access the event_cache_size directly from the server object.Mark Haines2016-06-161-14/+0
| | | | | | | | | | This means that the workers can override the event_cache_size directly without clobbering the value in the main synapse config.
* | Access replication_url from the worker config directlyMark Haines2016-06-161-4/+0
| |
* | Comment on what's going on in clobber_with_worker_configMark Haines2016-06-161-1/+12
| |
* | Add worker config moduleMark Haines2016-06-161-0/+71
| |
* | Inline the synchrotron and pusher configs into the main configMark Haines2016-06-163-63/+74
| |
* | Add function to load config without generating itMark Haines2016-06-091-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
* Allow setting of gc.set_thresholdsErik Johnston2016-06-071-1/+18
|
* brand the email from headerMatthew Hodgson2016-06-021-1/+1
|
* Add vector.im to default secondary_directory_servers and add comment ↵David Baker2016-05-311-0/+4
| | | | explaining it's not a permanent solution
* Add federation room list servletDavid Baker2016-05-311-0/+6
|
* Move the functions for parsing app service configMark Haines2016-05-171-1/+106
|
* Clean up the blacklist/whitelist handling.Mark Haines2016-05-161-6/+6
| | | | | | | Always set the config key with an empty list, even if a list isn't specified. This means that the codepaths are the same for both the empty list and for a missing key. Since the behaviour is the same for both cases this makes the code somewhat easier to reason about.
* Merge branch 'develop' into matthew/preview_url_ip_whitelistMark Haines2016-05-165-1/+119
|\
| * Create user with expiryNegi Fazeli2016-05-132-0/+11
| | | | | | | | | | | | - Add unittests for client, api and handler Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com>
| * More consistent config namingDavid Baker2016-05-101-1/+1
| |
| * Add config option to not send email notifs for new usersDavid Baker2016-05-101-0/+4
| |
| * fix layout; handle app naming in synapse, not jinjaMatthew Hodgson2016-05-051-0/+5
| |
| * fix assorted typos in default configMatthew Hodgson2016-05-041-3/+3
| |
| * Try imports in configDavid Baker2016-04-291-0/+7
| |
| * Default enable email notifs to FalseDavid Baker2016-04-291-1/+1
| |
| * Correct public_baseurl defaultDavid Baker2016-04-291-2/+2
| |
| * Nicer get() shorthandDavid Baker2016-04-291-3/+2
| |
| * Remove redundant docstringDavid Baker2016-04-291-4/+0
| |
| * Correct default template and add text templateDavid Baker2016-04-291-1/+2
| |
| * Send mail notifs with a plaintext part tooDavid Baker2016-04-291-0/+2
| |
| * Merge remote-tracking branch 'origin/develop' into dbkr/email_notifsDavid Baker2016-04-292-1/+19
| |\
| * | pep8David Baker2016-04-281-1/+1
| | |
| * | Hopefully all remaining bits for email notifsDavid Baker2016-04-272-1/+16
| | | | | | | | | | | | 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
| * | Generate mails from a templateDavid Baker2016-04-201-10/+25
| | |
| * | Send a rather basic email notifDavid Baker2016-04-202-1/+64
| | | | | | | | | | | | Also pep8 fixes
* | | add a url_preview_ip_range_whitelist config param so we can whitelist the ↵Matthew Hodgson2016-05-011-0/+14
| |/ |/| | | | | matrix.org IP space
* | Make pyjwt dependency optionalErik Johnston2016-04-251-1/+16
| |
* | Merge pull request #746 from matrix-org/markjh/split_out_pusherMark Haines2016-04-221-0/+1
|\ \ | | | | | | Optionally split out the pushers into a separate process
| * | Optionally split out the pushers into a separate processMark Haines2016-04-211-0/+1
| |/
* | Merge pull request #687 from nikriek/jwt-fixErik Johnston2016-04-211-0/+2
|\ \ | |/ |/| Fix issues with JWT login
| * Fix issues with JWT loginNiklas Riekenbrauck2016-04-211-0/+2
| |
* | Give install requirementsErik Johnston2016-04-131-1/+7
| |
* | Add back in helpful description for missing url_preview_ip_range_blacklistErik Johnston2016-04-131-1/+5
| |
* | Sanitize the optional dependencies for spider APIErik Johnston2016-04-131-10/+28
| |
* | Merge pull request #688 from matrix-org/matthew/preview_urlsMatthew Hodgson2016-04-111-2/+75
|\ \ | | | | | | URL previewing support
| * | fix typoMatthew Hodgson2016-04-081-1/+1
| | |
| * | Add url_preview_enabled config option to turn on/off preview_url endpoint. ↵Matthew Hodgson2016-04-081-4/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | defaults to off. Add url_preview_ip_range_blacklist to let admins specify internal IP ranges that must not be spidered. Add url_preview_url_blacklist to let admins specify URL patterns that must not be spidered. Implement a custom SpiderEndpoint and associated support classes to implement url_preview_ip_range_blacklist Add commentary and generally address PR feedback
| * | Merge branch 'develop' into matthew/preview_urlsMatthew Hodgson2016-04-042-1/+39
| |\|
| * | Merge branch 'develop' into matthew/preview_urlsMatthew Hodgson2016-03-277-25/+118
| |\ \
| * | | initial WIP of a tentative preview_url endpoint - incomplete, untested, ↵Matthew Hodgson2016-01-241-1/+5
| | | | | | | | | | | | | | | | experimental, etc. just putting it here for safekeeping for now
* | | | add tls propertyChristoph Witzany2016-04-061-6/+10
| | | |
* | | | Introduce LDAP authenticationChristoph Witzany2016-04-062-1/+50
| |_|/ |/| |
* | | Add JWT supportNiklas Riekenbrauck2016-03-292-1/+39
| |/ |/|
* | Add config to create guest account on 3pid inviteErik Johnston2016-03-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when a 3pid invite request is sent to an identity server, it includes a provisioned guest access token. This allows the link in the, say, invite email to include the guest access token ensuring that the same account is used each time the link is clicked. This flow has a number of flaws, including when using different servers or servers that have guest access disabled. For now, we keep this implementation but hide it behind a config option until a better flow is implemented.
* | Use syntax that works on both py2.7 and py3Mark Haines2016-03-072-2/+2
| |
* | config,handlers/_base: added homeserver config for what state is included in ↵Patrik Oldsberg2016-03-042-1/+42
| | | | | | | | | | | | a room invite Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
* | add 800x600 thumbnails to make vector look prettier (and anyone else who ↵Matthew Hodgson2016-03-021-0/+3
| | | | | | | | likes big thumbnails)
* | Derive macaroon_secret_key from signing key.Erik Johnston2016-02-082-16/+30
| | | | | | | | | | | | Unfortunately, there are people that are running synapse without a `macaroon_sercret_key` set. Mandating they set one is a good solution, except that breaking auto upgrades is annoying.
* | Error if macaroon key is missing from configDaniel Wagner-Hall2016-02-053-18/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Rename config field to reflect yaml nameDaniel Wagner-Hall2016-02-031-3/+3
| |
* | Add config option for setting the trusted id servers, disabling checking the ↵Mark Haines2016-01-291-0/+7
|/ | | | ID server in integration tests
* Merge pull request #473 from matrix-org/erikj/ssh_manholeErik Johnston2016-01-071-1/+1
|\ | | | | Change manhole to use ssh
| * s/telnet/ssh/Erik Johnston2016-01-071-1/+1
| |
* | copyrightsMatthew Hodgson2016-01-0717-17/+17
| |
* | Config Comment mixup in captcha public/private keyRobin Lambertz2016-01-061-2/+2
|/
* Added a single line to explain what the server_name is used forMads R. Christensen2015-12-021-0/+1
|
* CommentErik Johnston2015-11-191-0/+2
|
* Split out text for missing config options.Erik Johnston2015-11-181-16/+26
| | | | | This allows packages to more easily override the default messages to include package specific options.
* Merge branch 'develop' into sh-cas-auth-via-homeserverSteven Hammerton2015-11-171-1/+5
|\
| * Fix race creating directoriesDaniel Wagner-Hall2015-11-121-1/+5
| |
* | Allow hs to do CAS login completely and issue the client with a login token ↵Steven Hammerton2015-11-051-1/+1
| | | | | | | | that can be redeemed for the usual successful login response
* | Add service URL to CAS configSteven Hammerton2015-11-041-0/+3
|/
* Allow guests to register and call /events?room_id=Daniel Wagner-Hall2015-11-041-0/+6
| | | | | | | This follows the same flows-based flow as regular registration, but as the only implemented flow has no requirements, it auto-succeeds. In the future, other flows (e.g. captcha) may be required, so clients should treat this like the regular registration flow choices.
* Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into developErik Johnston2015-10-234-3/+39
|\
| * Add config option to disable password loginErik Johnston2015-10-224-3/+39
| |
* | Add config for how many bcrypt rounds to use for password hashesMark Haines2015-10-161-0/+6
|/ | | | | By default we leave it at the default value of 12. But now we can reduce it for preparing users for loadtests or running integration tests.
* Only turn on the twisted deferred debugging if full_twisted_stacktraces is ↵Mark Haines2015-10-131-0/+8
| | | | set in the config
* Default cas_required_attributes to empty dictionarySteven Hammerton2015-10-121-1/+1
|
* Support multiple required attributes in CAS response, and in a nicer config ↵Steven Hammerton2015-10-121-15/+4
| | | | format too
* Allow optional config params for a required attribute and it's value, if ↵Steven Hammerton2015-10-121-0/+15
| | | | specified any CAS user must have the given attribute and the value must equal
* Provide ability to login using CASSteven Hammerton2015-10-102-1/+41
|
* Preserve version string in user agentDaniel Wagner-Hall2015-10-051-1/+1
|
* Allow synapse's useragent to be customizedDaniel Wagner-Hall2015-10-021-0/+1
| | | | | This will allow me to write tests which verify which server made HTTP requests in a federation context.
* Front-load spacesDaniel Wagner-Hall2015-09-221-7/+7
|
* Implement configurable stats reportingDaniel Wagner-Hall2015-09-2214-19/+58
| | | | | | | | | | 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.
* Merge pull request #272 from matrix-org/daniel/insecureclientDaniel Wagner-Hall2015-09-151-0/+8
|\ | | | | Allow configuration to ignore invalid SSL certs
| * Use shorter config key nameDaniel Wagner-Hall2015-09-151-3/+3
| |
| * Merge branch 'daniel/insecureclient' into developDaniel Wagner-Hall2015-09-091-0/+8
| |\
| | * Better document the intent of the insecure SSL settingDaniel Wagner-Hall2015-09-091-2/+6
| | |
| | * Allow configuration to ignore invalid SSL certsDaniel Wagner-Hall2015-09-091-0/+4
| | | | | | | | | | | | | | | This will be useful for sytest, and sytest only, hence the aggressive config key name.
* | | Hacky attempt at catching SIGHUP and rotating the logfile aroundPaul "LeoNerd" Evans2015-09-141-0/+14
|/ /
* | Merge branch 'master' into developMark Haines2015-09-071-1/+1
|\ \ | |/ |/| | | | | Conflicts: setup.py
| * Lists use 'append'Erik Johnston2015-09-021-1/+1
| |
* | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into developErik Johnston2015-09-011-0/+2
|\|
| * Actually add config pathErik Johnston2015-08-281-0/+2
| |
* | Merge branch 'release-v0.10.0' into developMark Haines2015-08-283-8/+80
|\| | | | | | | | | | | | | Conflicts: synapse/handlers/auth.py synapse/python_dependencies.py synapse/rest/client/v1/login.py
| * Merge pull request #250 from matrix-org/erikj/generated_directoryErik Johnston2015-08-251-2/+15
| |\ | | | | | | Add config option to specify where generated files should be dumped
| | * Update config docErik Johnston2015-08-251-1/+2
| | |
| | * s/--generated-directory/--keys-directory/Erik Johnston2015-08-251-7/+7
| | |
| | * Add config option to specify where generated files should be dumpedErik Johnston2015-08-251-2/+14
| | |
| * | Warn if we encounter unexpected files in config directoriesErik Johnston2015-08-251-7/+17
| |/
| * Allow specifying directories as config filesErik Johnston2015-08-251-6/+24
| |
| * Merge pull request #245 from matrix-org/erikj/configurable_client_locationErik Johnston2015-08-251-0/+1
| |\ | | | | | | Allow specifying a directory to host a web client from
| | * Allow specifying a directory to host a web client fromErik Johnston2015-08-251-0/+1
| | |
| * | Fix typo when using sys.stderr.writeErik Johnston2015-08-251-1/+1
| | |
| * | Add utility to parse config and print out a keyErik Johnston2015-08-251-0/+30
| |/ | | | | | | | | | | | | | | | | Usage: ``` $ python -m synapse.config read server_name -c homeserver.yaml localhost ```
* | Fix typo in module imports and package dependenciesMark Haines2015-08-251-1/+1
| |
* | Remove syutil dependency in favour of smaller single-purpose librariesMark Haines2015-08-241-19/+16
| |
* | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-201-0/+59
|\|
| * Fix flake8 warningMark Haines2015-08-131-0/+1
| |
| * Merge remote-tracking branch 'origin/develop' into ↵Mark Haines2015-08-132-41/+48
| |\ | | | | | | | | | erikj/generate_presice_thumbnails
| * | Doc-string for config ultility functionMark Haines2015-08-121-0/+11
| | |
| * | Add config option for setting the list of thumbnail sizes to precalculateMark Haines2015-08-121-0/+39
| | |
| * | Make a config option for whether to generate new thumbnail sizes dynamicallyMark Haines2015-08-121-0/+8
| | |
* | | Issue macaroons as opaque auth tokensDaniel Wagner-Hall2015-08-181-0/+4
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | This just replaces random bytes with macaroons. The macaroons are not inspected by the client or server. In particular, they claim to have an expiry time, but nothing verifies that they have not expired. Follow-up commits will actually enforce the expiration, and allow for token refresh. See https://bit.ly/matrix-auth for more information
* | Fix the --generate-keys option. Make it do the same thing as ↵Mark Haines2015-08-121-45/+36
| | | | | | | | --generate-config does when the config file exists, but without printing a warning
* | Add a --generate-keys optionPaul "LeoNerd" Evans2015-08-071-0/+9
| |
* | Only print the pidfile path on startup if requested by a commandline flagPaul "LeoNerd" Evans2015-08-071-0/+7
|/
* Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2015-07-211-2/+2
|\
| * typoMatthew Hodgson2015-07-081-2/+2
| |
* | Close, but no cigar.David Baker2015-07-141-2/+2
| |
* | Small tweaks to SAML2 configuration.Erik Johnston2015-07-101-18/+30
| | | | | | | | | | - Add saml2 config docs to default config. - Use existence of saml2 config to indicate if saml2 should be enabled.
* | Merge pull request #201 from EricssonResearch/msba/saml2-developErik Johnston2015-07-102-2/+45
|\ \ | | | | | | Integrate SAML2 basic authentication - uses pysaml2
| * | Make SAML2 optional and add some references/commentsMuthu Subramanian2015-07-091-0/+14
| | |
| * | code beautifyMuthu Subramanian2015-07-082-1/+3
| | |
| * | Integrate SAML2 basic authentication - uses pysaml2Muthu Subramanian2015-07-082-3/+30
| |/
* | We don't want semicolons.Erik Johnston2015-07-091-1/+1
| |
* | remove the tls_certificate_chain_path param and simply support ↵Matthew Hodgson2015-07-091-21/+9
| | | | | | | | tls_certificate_path pointing to a file containing a chain of certificates
* | document tls_certificate_chain_path more clearlyMatthew Hodgson2015-07-091-0/+5
| |
* | oops, context.tls_certificate_chain_file() expects a file, not a certificate.Matthew Hodgson2015-07-081-4/+1
| |
* | *cough*Matthew Hodgson2015-07-081-2/+3
| |
* | add new optional config for tls_certificate_chain_path for folks with ↵Matthew Hodgson2015-07-081-3/+17
|/ | | | intermediary SSL certs
* Make upload dir a configurable path.Eric Myhre2015-06-181-0/+5
| | | | | | Fixes SYN-425. Signed-off-by: Eric Myhre <hash@exultant.us>
* Correct -H SERVER_NAME in config-missing complaint messagePaul "LeoNerd" Evans2015-06-161-2/+2
|
* Remove redundant newlineErik Johnston2015-06-151-2/+1
|
* Document listener config. Remove deprecated config optionsErik Johnston2015-06-152-36/+42
|
* Add backwards compat support for metrics, manhole and webclient config optionsErik Johnston2015-06-122-9/+27
|
* Correctly handle x_forwaded listener optionErik Johnston2015-06-121-0/+2
|
* Use config.listenersErik Johnston2015-06-121-30/+84
|
* Begin changing the config formatErik Johnston2015-06-111-8/+24
|
* Add config option to disable compression of http responsesErik Johnston2015-06-011-0/+6
|
* Merge pull request #170 from matrix-org/markjh/SYT-8-recaptchaMark Haines2015-05-291-0/+4
|\ | | | | Allow endpoint for verifying recaptcha to be configured
| * Merge branch 'develop' into markjh/SYT-8-recaptchaMark Haines2015-05-291-1/+1
| |\ | | | | | | | | | | | | Conflicts: synapse/handlers/auth.py
| * | Add config for setting the recaptcha verify api endpoint, so we can test it ↵Mark Haines2015-05-291-0/+4
| | | | | | | | | | | | in sytest
* | | Add config option to turn off freezing events. Use new encode_json api and ↵Erik Johnston2015-05-291-0/+1
| |/ |/| | | | | ujson.loads
* | Registration should be disabled by defaultErik Johnston2015-05-281-1/+1
|/
* s/metric_interface/metric_bind_host/Erik Johnston2015-05-221-3/+3
|
* Enable changing the interface the metrics listener binds toErik Johnston2015-05-221-1/+5
|
* Merge branch 'develop' of github.com:matrix-org/synapse into developDavid Baker2015-05-071-18/+29
|\
| * Fix the --help option for synapseMark Haines2015-05-051-18/+29
| |
* | TypoDavid Baker2015-05-071-1/+1
|/
* Use the daemonize key from the config if it existsMark Haines2015-05-011-1/+4
|
* Allow generate-config to run against an existing config file to generate ↵Mark Haines2015-05-013-14/+26
| | | | default keys
* Allow "manhole" to be ommited from the configMark Haines2015-04-301-1/+1
|
* Remove the ~, comment the lines insteadMark Haines2015-04-302-2/+2
|
* Update key.pyMark Haines2015-04-301-1/+2
|
* Update metrics.pyMark Haines2015-04-301-2/+2
|
* Merge branch 'develop' into markjh/config_cleanupMark Haines2015-04-301-0/+1
|\ | | | | | | | | Conflicts: synapse/config/captcha.py
| * Undo changes to logger config, ie. remove the access_log_file option: ↵David Baker2015-04-301-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 nameDavid Baker2015-04-301-0/+11
| |
| * Add an access_logDavid Baker2015-04-302-0/+7
| | | | | | | | SYN-161 #resolve
* | Write a default log_config when generating configMark Haines2015-04-304-4/+57
| |
* | Don't break when sizes or durations are given as integersMark Haines2015-04-301-9/+12
| |
* | Add a random string to the auto generated key idMark Haines2015-04-301-1/+3
| |
* | Allow --enable-registration to be passed on the commandlineMark Haines2015-04-301-3/+16
| |
* | Use disable_registration keys if they are presentMark Haines2015-04-301-0/+5
| |
* | Allow multiple config files, set up a default config before applying the ↵Mark Haines2015-04-302-22/+38
| | | | | | | | config files
* | remove duplicate parse_size methodMark Haines2015-04-301-9/+0
| |
* | Manually generate the default config yaml, remove most of the commandline ↵Mark Haines2015-04-3014-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_distributionMark Haines2015-04-296-50/+40
|\ | | | | | | | | Conflicts: synapse/config/homeserver.py
| * Delete ugly commented out log line.Mark Haines2015-04-291-1/+0
| |
| * comment out ugly test loglineMatthew Hodgson2015-04-291-1/+1
| |
| * Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-284-48/+11
| |\
| | * Merge pull request #126 from matrix-org/csauthMark Haines2015-04-283-45/+7
| | |\ | | | | | | | | Client / Server Auth Refactor
| | | * Remove now-redundant email configDavid Baker2015-04-232-44/+1
| | | |
| | | * Merge branch 'develop' into csauthDavid Baker2015-04-174-12/+44
| | | |\
| | | * | New registration for C/S API v2. Only ReCAPTCHA working currently.David Baker2015-03-301-1/+6
| | | | |
| | * | | Output vim style mode markers into the yaml config fileMark Haines2015-04-281-3/+4
| | | | |
| * | | | Move database configuration into config moduleErik Johnston2015-04-271-2/+21
| | | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-271-0/+1
| |\| | |
| * | | | Update --database-path metavar to SQLITE_DATABASE_PATHErik Johnston2015-04-171-1/+1
| | | | |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-151-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-071-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-073-12/+44
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-03-202-4/+33
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Make database selection configurableErik Johnston2015-03-201-0/+9
| | | | | | |
* | | | | | | Add config for setting the perspective serversMark Haines2015-04-242-4/+22
| | | | | | |
* | | | | | | Merge branch 'develop' into key_distributionMark Haines2015-04-241-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix spellingMark Haines2015-04-241-1/+1
| | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-14 20:47:59 +0000