summary refs log tree commit diff
path: root/synapse/config (follow)
Commit message (Expand)AuthorAgeFilesLines
* Require ECDH key exchange & remove dh_params (#4429)Amber Brown2019-01-221-40/+0
* Changing macaroon_secret_key no longer logs you out (#4387)Richard van der Hoff2019-01-161-3/+0
* Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1Richard van der Hoff2019-01-101-2/+2
|\
| * Revert "Fix macaroon_secret_key fallback logic"Richard van der Hoff2019-01-101-3/+3
| * Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34Richard van der Hoff2019-01-101-5/+5
| |\
| | * Fix macaroon_secret_key fallback logicRichard van der Hoff2019-01-101-3/+3
| | * Fix fallback to signing key for macaroon-secret-keyRichard van der Hoff2019-01-101-2/+2
* | | Fix synapse.config.__main__ on python 3 (#4356)Amber Brown2019-01-081-1/+1
* | | Check jinja version for consent resource (#4327)Richard van der Hoff2019-01-071-1/+37
* | | Add a script to generate a clean config file (#4315)Richard van der Hoff2018-12-229-46/+89
* | | Fix indentation in default config (#4313)Richard van der Hoff2018-12-221-35/+35
* | | Merge branch 'release-v0.34.0' into developRichard van der Hoff2018-12-111-15/+27
|\| |
| * | Stop installing Matrix Console by defaultRichard van der Hoff2018-12-111-15/+27
* | | Implement SAML2 authentication (#4267)Richard van der Hoff2018-12-072-1/+112
* | | Rip out half-implemented m.login.saml2 support (#4265)Richard van der Hoff2018-12-062-57/+1
* | | Implement .well-known handling (#4262)Richard van der Hoff2018-12-051-0/+9
|/ /
* | Add an option to enable recording IPs for appservice users (#3831)Travis Ralston2018-12-041-0/+5
* | Add an option to disable search for homeservers which may not be interested i...Travis Ralston2018-12-041-1/+11
* | Remove riot.im from the list of trusted Identity Servers in the default confi...Neil Johnson2018-11-201-1/+3
* | Add option to track MAU stats (but not limit people) (#3830)Travis Ralston2018-11-151-0/+6
* | Add config variables for enabling terms auth and the policy name (#4142)Travis Ralston2018-11-061-0/+18
* | Set the encoding to UTF8 in the default logconfig (#4138)Amber Brown2018-11-031-0/+1
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/alias_disa...Erik Johnston2018-10-255-88/+92
|\ \
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into matthew/autocrea...Neil Johnson2018-10-254-68/+91
| |\ \
| | * | Fix a number of flake8 errorsRichard van der Hoff2018-10-241-1/+1
| | * | Make scripts/ and scripts-dev/ pass pyflakes (and the rest of the codebase on...Amber Brown2018-10-202-63/+60
| | * | Calculate absolute path for email templatesRichard van der Hoff2018-10-191-22/+18
| * | | isortNeil Johnson2018-10-241-2/+1
| * | | remove errant exception and styleNeil Johnson2018-10-231-1/+1
| * | | clean up config error logic and importsNeil Johnson2018-10-171-5/+4
| * | | improve auto room join logic, comments and testsNeil Johnson2018-10-121-1/+10
| * | | fix UTsMatthew Hodgson2018-09-281-1/+1
| * | | untested stab at autocreating autojoin roomsMatthew Hodgson2018-09-281-0/+4
* | | | Use allow/denyErik Johnston2018-10-251-6/+6
* | | | Use match rather than searchErik Johnston2018-10-241-2/+3
* | | | Add config option to control alias creationErik Johnston2018-10-192-1/+103
| |/ / |/| |
* | | Put the warning blob at the top of the fileRichard van der Hoff2018-10-171-6/+9
* | | Ship the email templates as package_dataRichard van der Hoff2018-10-171-3/+30
|/ /
* | Replaced all occurences of e.message with str(e)Schnuffle2018-09-271-1/+1
* | Remove some superfluous logging (#3855)Amber Brown2018-09-131-1/+16
* | Fix jwt import checkRichard van der Hoff2018-09-072-1/+1
* | move threepid checker to config, add missing yieldsNeil Johnson2018-08-311-0/+17
* | Change admin_uri to admin_contact in config and errorsErik Johnston2018-08-241-2/+2
* | Implement trail usersErik Johnston2018-08-231-0/+6
* | Port over enough to get some sytests running on Python 3 (#3668)Amber Brown2018-08-201-1/+2
* | Integrate presence from hotfixes (#3694)Amber Brown2018-08-181-0/+6
* | server limits config docsNeil Johnson2018-08-171-0/+26
* | add new error type ResourceLimitNeil Johnson2018-08-161-0/+1
* | update admin email to uriNeil Johnson2018-08-151-1/+1
* | replace admin_email with admin_uri for greater flexibilityNeil Johnson2018-08-151-1/+1
* | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-131-0/+4
* | Revert "support admin_email config and pass through into blocking errors, ret...Neil Johnson2018-08-131-4/+0
* | support admin_email config and pass through into blocking errors, return Auth...Neil Johnson2018-08-131-0/+4
* | log *after* reloading log configRichard van der Hoff2018-08-101-2/+1
* | Merge branch 'develop' into neilj/disable_hsNeil Johnson2018-08-081-0/+3
|\ \
| * | implement reserved users for mau limitsNeil Johnson2018-08-071-1/+1
| * | load mau limit threepidsNeil Johnson2018-08-061-0/+3
* | | disable HS from configNeil Johnson2018-08-041-0/+4
|/ /
* / fix (lots of) py3 test failuresNeil Johnson2018-08-031-2/+2
|/
* Merge branch 'master' into developRichard van der Hoff2018-08-021-0/+2
|\
| * Merge pull request #3377 from Valodim/note-affinityRichard van der Hoff2018-07-191-0/+2
| |\
| | * add note that the affinity package is required for the cpu_affinity settingVincent Breitmoser2018-06-091-0/+2
| | * Merge tag 'v0.31.0'Neil Johnson2018-06-063-1/+20
| | |\
* | | | remove need to plot limit_usage_by_mauNeil Johnson2018-08-011-3/+6
* | | | coding styleNeil Johnson2018-07-311-1/+1
* | | | limit register and sign in on number of monthly usersNeil Johnson2018-07-301-0/+5
* | | | Comment dummy TURN parameters in default configDavid Baker2018-07-111-2/+2
|/ / /
* | | run isortAmber Brown2018-07-0913-51/+59
* | | More server_name validationRichard van der Hoff2018-07-041-2/+9
* | | fix testsMatthew Hodgson2018-06-281-0/+1
* | | add ip_range_whitelist parameter to limit where ASes can connect fromMatthew Hodgson2018-06-281-1/+10
* | | Write a clear restart indicator in logsRichard van der Hoff2018-06-201-6/+18
* | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2018-06-051-0/+3
|\| | | |/ |/|
| * remove trailing whitespaceRichard van der Hoff2018-05-301-2/+2
| * fix english and wrap commentRichard van der Hoff2018-05-301-1/+2
| * add link to thorough instruction how to configure consentRuben Barkow2018-05-251-0/+2
* | Add private IPv6 addresses to preview blacklist #3312Felix Schäfer2018-06-011-0/+3
* | Run Prometheus on a different port, optionally. (#3274)Amber Brown2018-05-311-0/+10
* | Fix default for send_server_notice_to_guestsRichard van der Hoff2018-05-251-1/+1
* | Avoid sending consent notice to guest usersRichard van der Hoff2018-05-251-1/+7
|/
* Allow overriding the server_notices user's avatarRichard van der Hoff2018-05-231-3/+12
* Support for putting %(consent_uri)s in messagesRichard van der Hoff2018-05-231-4/+7
* Reject attempts to send event before privacy consent is givenRichard van der Hoff2018-05-221-0/+10
* Move consent config parsing into ConsentConfigRichard van der Hoff2018-05-221-1/+15
* Send users a server notice about consentRichard van der Hoff2018-05-221-0/+8
* Rename 'version' param on user consent configRichard van der Hoff2018-05-221-4/+6
* Replace inline docstrings with "Attributes" in class docstringRichard van der Hoff2018-05-181-23/+15
* Infrastructure for a server notices roomRichard van der Hoff2018-05-172-1/+89
* ConsentResource to gather policy consent from usersRichard van der Hoff2018-05-154-3/+63
* Merge pull request #3085 from NotAFile/py3-config-text-modeRichard van der Hoff2018-04-302-4/+4
|\
| * open log_config in text mode tooAdrian Tschira2018-04-281-1/+1
| * Open config file in non-bytes modeAdrian Tschira2018-04-101-3/+3
* | Merge pull request #3084 from NotAFile/py3-certs-byte-modeRichard van der Hoff2018-04-301-2/+2
|\ \
| * | Open certificate files as bytesAdrian Tschira2018-04-101-2/+2
| |/
* / Use six.moves.urlparseAdrian Tschira2018-04-151-2/+2
|/
* Merge pull request #3074 from NotAFile/fix-py3-printsRichard van der Hoff2018-04-091-5/+5
|\
| * use python3-compatible printsAdrian Tschira2018-04-061-5/+5
* | Replace some type checks with six type checksAdrian Tschira2018-04-072-5/+9
|/
* spell out not to massively increase bcrypt roundsMatthew Hodgson2018-03-191-1/+3
* Add replication http endpoint for event sendingErik Johnston2018-02-071-0/+8
* Add federation_domain_whitelist option (#2820)Matthew Hodgson2018-01-221-0/+22
* Merge pull request #2813 from matrix-org/matthew/registrations_require_3pidMatthew Hodgson2018-01-221-0/+19
|\
| * rewrite based on PR feedback:Matthew Hodgson2018-01-191-3/+9
| * add registrations_require_3pidMatthew Hodgson2018-01-191-0/+13
* | Fix passing wrong config to provider constructorErik Johnston2018-01-181-1/+1
* | Remove duplicate directory testErik Johnston2018-01-181-4/+0
* | Fixup commentsErik Johnston2018-01-181-1/+5
* | Make storage providers more configurableErik Johnston2018-01-181-11/+72
|/
* fix typoMatthew Hodgson2018-01-161-1/+1
* Actually make it workErik Johnston2018-01-121-0/+5
* Merge pull request #2763 from matrix-org/rav/fix_config_utsRichard van der Hoff2018-01-091-2/+2
|\
| * Fix broken config UTsRichard van der Hoff2018-01-091-2/+2
* | Make indentation of generated log config consistentRichard van der Hoff2018-01-091-17/+17
|/
* Remove 'verbosity'/'log_file' from generated cfgRichard van der Hoff2018-01-051-8/+4
* Merge pull request #2683 from seckrv/fix_pwd_auth_prov_typoRichard van der Hoff2017-12-181-2/+2
|\
| * synapse/config/password_auth_providers: Fixed bracket typoRichard von Seck2017-11-161-2/+2
* | Allow binds to both :: and 0.0.0.0Silke Hofstra2017-12-171-5/+3
* | Adapt the default config to bind on IPv6.Willem Mulder2017-12-171-8/+9
* | better docMatthew Hodgson2017-12-041-1/+4
* | switch to a simpler 'search_all_users' button as per review feedbackMatthew Hodgson2017-12-041-7/+8
* | Merge branch 'develop' into matthew/search-all-local-usersMatthew Hodgson2017-11-301-0/+6
|\ \
| * | Add config option to disable media_repo on main synapseRichard van der Hoff2017-11-221-0/+6
* | | specify default user_directory_include_patternMatthew Hodgson2017-11-301-0/+1
* | | untested WIP but might actually workMatthew Hodgson2017-11-291-3/+2
* | | Add user_directory_include_pattern config param to expand search results to a...Matthew Hodgson2017-11-292-1/+42
|/ /
* / Check group_id belongs to this domainLuke Barnard2017-11-161-0/+1
|/
* Print instead of loggingDavid Baker2017-11-131-11/+4
* Make the commented config have the defaultDavid Baker2017-11-091-1/+1
* better commentsDavid Baker2017-11-081-2/+5
* Log if any of the old config flags are setDavid Baker2017-11-081-2/+24
* Rename redact_content option to include_contentDavid Baker2017-11-081-15/+13
* Add a hook for custom rest endpointsRichard van der Hoff2017-11-021-0/+7
* Clean up backwards-compat hacks for ldapRichard van der Hoff2017-10-311-20/+19
* fix typoMatthew Hodgson2017-10-291-1/+1
* Fix error when running synapse with no logfileRichard van der Hoff2017-10-261-1/+5
* tip for generating tls_fingerprintsMatthew Hodgson2017-10-241-0/+6
* replace 'except:' with 'except Exception:'Richard van der Hoff2017-10-231-1/+1
* Flake8Erik Johnston2017-10-191-4/+0
* Add missing file...Erik Johnston2017-10-191-0/+36
* Add config to enable group creationErik Johnston2017-10-191-1/+2
* Improve error handling for missing files (#2551)Richard van der Hoff2017-10-173-17/+33
* pep8David Baker2017-10-171-1/+2
* Add config option to auto-join new users to roomsDavid Baker2017-10-161-0/+6
* Copy everything to backupErik Johnston2017-10-121-1/+3
* Basic implementation of backup media storeErik Johnston2017-10-121-0/+18
* Forgot the new file again :(David Baker2017-09-271-0/+35
* Make the spam checker a moduleDavid Baker2017-09-261-1/+3
* Factor out module loading to a separate placeDavid Baker2017-09-261-12/+10
* Add a config option to block all room invites (#2457)Richard van der Hoff2017-09-191-0/+10
* Fix process startupRichard van der Hoff2017-08-161-10/+13
* explain why CPU affinity is a good ideaMatthew Hodgson2017-08-151-0/+8
* Allow configuration of CPU affinityRichard van der Hoff2017-08-152-0/+13
* Add a frontend proxyErik Johnston2017-07-071-0/+2
* Change the config file generator to more descriptive explanation of push.reda...Caleb James DeLisle2017-06-241-3/+11
* Fix TravisCI tests for PR #2301 - Fat finger mistakeCaleb James DeLisle2017-06-231-0/+37
* Fix TravisCI tests for PR #2301Caleb James DeLisle2017-06-232-41/+1
* Add configuration parameter to allow redaction of content from push messages ...Caleb James DeLisle2017-06-232-1/+42
* Initial worker implErik Johnston2017-06-161-0/+4
* Configurable maximum number of events requested by /sync and /messages (#2220)Pablo Saavedra2017-05-131-0/+6
* web_server_root documentation fixMatthew Wolff2017-04-171-0/+6
* 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 SMTPDaniel Dent2017-04-051-0/+16
* | Merge pull request #2097 from matrix-org/erikj/repl_tcp_clientErik Johnston2017-04-051-1/+3
|\ \ | |/ |/|
| * 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 redirectRichard van der Hoff2017-03-101-1/+12
| * Refactor logger config for workersRichard van der Hoff2017-03-101-5/+16
* | Reread log config on SIGHUPRichard van der Hoff2017-03-101-10/+19
|/
* Fix typo in config comments.Tyler Smith2017-02-111-1/+1
* Merge pull request #1835 from matrix-org/erikj/fix_workersErik Johnston2017-01-201-0/+10
|\
| * 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
|/
* Allow configuring the Riot URL used in notification emailsAdrian Perez de Castro2017-01-131-0/+7
* Merge pull request #1795 from matrix-org/erikj/port_defaultsErik Johnston2017-01-131-4/+13
|\
| * 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
|/
* 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
* | Add IPv6 comment to default configJohannes Löthberg2016-12-181-0/+4
* | Make default homeserver config use bind_addressesJohannes Löthberg2016-12-181-4/+5
|/
* 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
* 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 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
* Merge pull request #1167 from matrix-org/markjh/fingerprintsMark Haines2016-10-121-0/+38
|\
| * 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
|/
* 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
* Flake8Kegan Dougal2016-08-301-1/+2
* Allow application services to have an optional 'url'Kegan Dougal2016-08-301-0/+6
* Merge pull request #1026 from matrix-org/paul/thirdpartylookupPaul Evans2016-08-181-0/+10
|\
| * 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
* 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
* 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
* | | Remove the legacy v0 content upload API.Mark Haines2016-06-211-20/+0
| |/ |/|
* | Turn use_frozen_events off by defaultErik Johnston2016-06-171-1/+1
* | Use worker_ prefixes for worker config, use existing support for multiple con...Mark Haines2016-06-161-41/+8
* | Access the event_cache_size directly from the server object.Mark Haines2016-06-161-14/+0
* | 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
|/
* 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 explaini...David Baker2016-05-311-0/+4
* 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
* Merge branch 'develop' into matthew/preview_url_ip_whitelistMark Haines2016-05-165-1/+119
|\
| * Create user with expiryNegi Fazeli2016-05-132-0/+11
| * 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
| |\