summary refs log tree commit diff
path: root/synapse/config (follow)
Commit message (Expand)AuthorAgeFilesLines
* Make worker listener config backwards compatErik Johnston2017-01-201-0/+10
* 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
| |\
| * | pep8David Baker2016-04-281-1/+1
| * | Hopefully all remaining bits for email notifsDavid Baker2016-04-272-1/+16
| * | Generate mails from a templateDavid Baker2016-04-201-10/+25
| * | Send a rather basic email notifDavid Baker2016-04-202-1/+64
* | | add a url_preview_ip_range_whitelist config param so we can whitelist the mat...Matthew Hodgson2016-05-011-0/+14
| |/ |/|
* | 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 processMark Haines2016-04-211-0/+1
| |/
* | Merge pull request #687 from nikriek/jwt-fixErik Johnston2016-04-211-0/+2
|\ \ | |/ |/|
| * 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
|\ \
| * | fix typoMatthew Hodgson2016-04-081-1/+1
| * | Add url_preview_enabled config option to turn on/off preview_url endpoint. de...Matthew Hodgson2016-04-081-4/+73
| * | 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, exper...Matthew Hodgson2016-01-241-1/+5
* | | | 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
* | 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
* | add 800x600 thumbnails to make vector look prettier (and anyone else who like...Matthew Hodgson2016-03-021-0/+3
* | Derive macaroon_secret_key from signing key.Erik Johnston2016-02-082-16/+30
* | Error if macaroon key is missing from configDaniel Wagner-Hall2016-02-053-18/+42
* | 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
|/
* Merge pull request #473 from matrix-org/erikj/ssh_manholeErik Johnston2016-01-071-1/+1
|\
| * 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
* 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 t...Steven Hammerton2015-11-051-1/+1
* | 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
* 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
|/
* Only turn on the twisted deferred debugging if full_twisted_stacktraces is se...Mark Haines2015-10-131-0/+8
* Default cas_required_attributes to empty dictionarySteven Hammerton2015-10-121-1/+1
* Support multiple required attributes in CAS response, and in a nicer config f...Steven Hammerton2015-10-121-15/+4
* Allow optional config params for a required attribute and it's value, if spec...Steven Hammerton2015-10-121-0/+15
* 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
* Front-load spacesDaniel Wagner-Hall2015-09-221-7/+7
* Implement configurable stats reportingDaniel Wagner-Hall2015-09-2214-19/+58
* Merge pull request #272 from matrix-org/daniel/insecureclientDaniel Wagner-Hall2015-09-151-0/+8
|\
| * 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
* | | 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
|\ \ | |/ |/|
| * 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
|\|
| * Merge pull request #250 from matrix-org/erikj/generated_directoryErik Johnston2015-08-251-2/+15
| |\
| | * 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 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
| |/
* | 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 erikj/generate_presice_thu...Mark Haines2015-08-132-41/+48
| |\
| * | 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
| |/ |/|
* | Fix the --generate-keys option. Make it do the same thing as --generate-confi...Mark Haines2015-08-121-45/+36
* | 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
* | Merge pull request #201 from EricssonResearch/msba/saml2-developErik Johnston2015-07-102-2/+45
|\ \
| * | 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 tls_certificat...Matthew Hodgson2015-07-091-21/+9
* | 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 interme...Matthew Hodgson2015-07-081-3/+17
|/
* Make upload dir a configurable path.Eric Myhre2015-06-181-0/+5
* 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
|\
| * Merge branch 'develop' into markjh/SYT-8-recaptchaMark Haines2015-05-291-1/+1
| |\
| * | Add config for setting the recaptcha verify api endpoint, so we can test it i...Mark Haines2015-05-291-0/+4
* | | Add config option to turn off freezing events. Use new encode_json api and uj...Erik Johnston2015-05-291-0/+1
| |/ |/|
* | 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 defa...Mark Haines2015-05-013-14/+26
* 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
|\
| * Undo changes to logger config, ie. remove the access_log_file option: decisio...David Baker2015-04-301-16/+0
| * 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
* | 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 conf...Mark Haines2015-04-302-22/+38
* | remove duplicate parse_size methodMark Haines2015-04-301-9/+0
* | Manually generate the default config yaml, remove most of the commandline arg...Mark Haines2015-04-3014-459/+442
|/
* Merge branch 'develop' into key_distributionMark Haines2015-04-296-50/+40
|\
| * 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
| | |\
| | | * 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
* | | | | | | Merge branch 'develop' into key_distributionMark Haines2015-04-241-0/+1
|\| | | | | |
| * | | | | | Call the super classes when generating configMark Haines2015-04-241-0/+1
| | |_|_|_|/ | |/| | | |
| * | | | | Update syutil version to 0.0.4Mark Haines2015-04-141-1/+1
| | |_|_|/ | |/| | |
* | | | | Add a config file for perspective serversMark Haines2015-04-242-0/+30
* | | | | Move the key related config parser into a separate fileMark Haines2015-04-243-85/+113
* | | | | Better help for the old-signing-key optionMark Haines2015-04-241-1/+4
* | | | | Implement remote key lookup apiMark Haines2015-04-221-2/+2
* | | | | Add a version 2 of the key server apiMark Haines2015-04-141-1/+33
|/ / / /
* | | / Fix --enable-registration flag to work if you don't give a valueErik Johnston2015-04-071-1/+1
| |_|/ |/| |
* | | Add AppServiceConfigKegan Dougal2015-03-312-1/+33
* | | turn --disable-registration into --enable-registration, given the default is ...Matthew Hodgson2015-03-301-11/+11
| |/ |/|
* | Merge pull request #109 from matrix-org/default_registrationErik Johnston2015-03-181-3/+30
|\ \
| * | Comment.Erik Johnston2015-03-161-0/+3
| * | Allow enabling of registration with --disable-registration falseErik Johnston2015-03-131-2/+8
| * | PEP8Erik Johnston2015-03-131-1/+1
| * | Implement registering with shared secret.Erik Johnston2015-03-131-3/+17
| * | Disable registration by defaultErik Johnston2015-03-131-0/+4
* | | Wire up the webclient optionDavid Baker2015-03-171-1/+3
| |/ |/|
* | Option to serve metrics from their own localhost-only TCP port instead of mux...Paul "LeoNerd" Evans2015-03-121-0/+5
* | Commandline option to enable metrics systemPaul "LeoNerd" Evans2015-03-122-1/+34
|/