summary refs log tree commit diff
path: root/synapse/config (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | |
* | | | | | | 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
| |/ |/| | | | | 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_registrationErik Johnston2015-03-181-3/+30
|\ \ | | | | | | Disable registration by default. Add script to register new users.
| * | 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
| |/ |/| | | | | | | | | 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" Evans2015-03-121-0/+5
| | | | | | | | muxed on the main listener
* | Commandline option to enable metrics systemPaul "LeoNerd" Evans2015-03-122-1/+34
|/
* Unused importErik Johnston2015-03-061-1/+1
|
* Don't look for an TLS private key if we have set --no-tlsErik Johnston2015-03-062-7/+13
|
* Merge pull request #83 from matrix-org/nofile_limit_configErik Johnston2015-03-021-0/+7
|\ | | | | Add config option to set the soft fd limit on start
| * By default set soft limit to hard limitErik Johnston2015-02-201-5/+5
| |
| * Add config option to set the soft fd limit on startErik Johnston2015-02-191-0/+7
| |
* | Make the federation server ratelimiting configurable.Erik Johnston2015-03-021-0/+36
| |
* | turns uris config options should append since it's a listDavid Baker2015-02-241-1/+1
| |
* | Add config option to disable registration.Erik Johnston2015-02-192-1/+35
|/
* Add a cache for get_eventMark Haines2015-02-112-0/+15
|
* yaml.load expects strings to be a yaml rather than fileErik Johnston2015-02-101-1/+2
|
* Use yaml logging config format because it is much nicerErik Johnston2015-02-101-1/+2
|
* Convert directory paths to absolute paths before daemonizingMark Haines2015-02-091-2/+3
|
* Allow ':memory:' as the database path for sqlite3Mark Haines2015-01-191-1/+4
|
* SYN-142: Rotate logs if logging to file. Fixed to a 4 file rotate with ↵Kegan Dougal2015-01-081-1/+4
| | | | 100MB/file for now.
* Add better help message for --server-name config option.Erik Johnston2015-01-081-2/+6
|
* Increase default maximum attachment size to 10MMark Haines2015-01-061-1/+1
|
* Update copyright noticesMark Haines2015-01-0612-12/+12
|
* SYN-142: Use a default log file 'homeserver.log' so people get logging by ↵Kegan Dougal2014-12-161-1/+1
| | | | default.
* Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse into developErik Johnston2014-12-131-2/+2
|\
| * Fix bug while generating the error message when a file path specified in the ↵Erik Johnston2014-12-131-2/+2
| | | | | | | | config doesn't exist
* | Limit the size of images that are thumbnailed serverside. Limit the size of ↵Mark Haines2014-12-111-0/+5
| | | | | | | | file that a server will download from a remote server
* | Merge branch 'develop' into media_repositoryMark Haines2014-12-102-2/+11
|\|
| * Don't log synapse.storage at DEBUG level when under -v; require -v -v for thatPaul "LeoNerd" Evans2014-12-021-0/+6
| |
| * SYN-187: Set a more sensible default for the content_addr v0.5.3bMark Haines2014-12-021-2/+5
| |
* | Get uploads working with new media repoMark Haines2014-12-022-0/+18
|/
* Be more helpful and tell the user how to generate a config too.David Baker2014-11-141-1/+4
|
* Adding --generate-config will not help if the user has not specified a ↵David Baker2014-11-141-1/+1
| | | | config file.
* Merge branch 'develop' into request_loggingMark Haines2014-11-141-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 Johnston2014-11-031-0/+3
| | | | | | | | ssl load balancer
* | Merge branch 'develop' into request_loggingMark Haines2014-10-308-12/+27
|\| | | | | | | | | Conflicts: synapse/config/logger.py
| * Fix pep8 warningsMark Haines2014-10-309-13/+29
| |
* | Pep8 and a few doc stringsMark Haines2014-10-301-3/+3
| |
* | Add a request-id to each log lineMark Haines2014-10-301-7/+16
|/
* Fix pyflakes warningsMark Haines2014-10-271-1/+1
|
* Fix auto generating signing_keysMark Haines2014-10-181-1/+1
|
* Merge branch develop into server2server_signingMark Haines2014-10-131-0/+2
|\ | | | | | | | | Conflicts: synapse/app/homeserver.py
| * Merge branch 'master' into developDavid Baker2014-10-021-1/+2
| |\
| | * Fix ncorrect ports in documentation and add notes on how generate-config ↵David Baker2014-10-021-1/+2
| | | | | | | | | | | | | | | | | | also generates certs bound to whatever hostname you give with --generate-config. SYN-87 #resolved
| * | Merge remote-tracking branch 'origin/master' into developMark Haines2014-10-021-0/+1
| |\|
| | * Update README setup instructions to be correct. Make synapse spit out ↵David Baker2014-10-021-0/+1
| | | | | | | | | | | | explanatory note when generating config to tell people to look at it and customise it.
* | | Merge branch 'develop' into server2server_signingMark Haines2014-09-304-3/+49
|\| | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py tests/rest/test_presence.py
| * | pyflakes cleanupErik Johnston2014-09-301-1/+0
| |/
| * Just use a yaml list for turn serversDavid Baker2014-09-251-1/+1
| |
| * Merge branch 'turn' into developDavid Baker2014-09-252-1/+43
| |\
| | * Make turn server endpoint return an empty object if no turn servers toDavid Baker2014-09-251-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 urisDavid Baker2014-09-241-3/+3
| | |
| | * Add support for TURN servers as per the TURN REST API ↵David Baker2014-09-232-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" Evans2014-09-231-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 Haines2014-09-231-9/+30
|/ | | | wrong format
* formattingKegan Dougal2014-09-191-5/+9
|
* Added support for the HS to send emails. Use it to send password resets. ↵Kegan Dougal2014-09-162-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 Dougal2014-09-051-0/+6
|
* Added a captcha config to the HS, to enable registration captcha checking ↵Kegan Dougal2014-09-052-1/+38
| | | | and for the recaptcha private key.
* Added a TODO note about YAML modeline for editorsPaul "LeoNerd" Evans2014-09-031-0/+3
|
* Default PID file should be 'homeserver.pid' to match the other ↵Paul "LeoNerd" Evans2014-09-031-1/+1
| | | | 'homeserver.*' naming convention
* fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵Matthew Hodgson2014-09-038-8/+8
| | | | hasn't been incorporated in time for launch.
* Limit the size of uploadsMark Haines2014-09-032-1/+41
|
* Add option to change content repo locationErik Johnston2014-09-031-0/+12
|
* Add copyright notices and fix pyflakes errorsMark Haines2014-09-032-2/+14
|
* rate limiting for message sendingMark Haines2014-09-021-2/+2
|
* Add ratelimiting configMark Haines2014-09-021-0/+21
|
* Add ratelimiting function to basehandlerMark Haines2014-09-021-1/+3
|
* Remove option for disabling webclient because it was confusingMark Haines2014-09-021-4/+1
|
* Default HTTP and HTTPS ports to 8008 and 8448Erik Johnston2014-09-021-2/+4
|
* os.makedirs is almost but not entirely unlike mkdir -pMark Haines2014-09-021-1/+2
|
* Fix typo when reading TLS configMark Haines2014-09-021-1/+1
|
* Make the config directory if the directory doesn't exisit when generating configMark Haines2014-09-021-0/+1
|
* More helpful error messages for missing configMark Haines2014-09-023-6/+29
|
* Add unsecure listener port to homeserverMark Haines2014-09-011-2/+5
|
* specify metavars in argparseMatthew Hodgson2014-09-011-2/+3
|
* Use yaml for config fileMark Haines2014-09-011-11/+6
|
* Use pregenerated DH params when generating configMark Haines2014-09-011-7/+29
|
* Listen using SSLMark Haines2014-09-011-1/+1
|
* Fix homeserver config parsingMark Haines2014-09-015-20/+35
|
* Add config tree to synapse. Add support for reading config from a fileMark Haines2014-08-317-0/+423