Mark Haines
|
2d4d2bbae4
|
Merge branch 'develop' into markjh/config_cleanup
Conflicts:
synapse/config/captcha.py
|
2015-04-30 16:54:55 +01:00 |
|
Mark Haines
|
2f1348f339
|
Write a default log_config when generating config
|
2015-04-30 16:52:57 +01:00 |
|
David Baker
|
5b02f33451
|
Undo changes to logger config, ie. remove the access_log_file option: decision is to support this through log_config rather tan adding an option.
|
2015-04-30 16:21:39 +01:00 |
|
David Baker
|
054aa0d58c
|
Do access log using python's logging stuff, just under a separate logger name
|
2015-04-30 16:21:38 +01:00 |
|
Mark Haines
|
74aaacf82a
|
Don't break when sizes or durations are given as integers
|
2015-04-30 16:04:02 +01:00 |
|
Mark Haines
|
c28f1d16f0
|
Add a random string to the auto generated key id
|
2015-04-30 15:13:14 +01:00 |
|
Mark Haines
|
265f30bd3f
|
Allow --enable-registration to be passed on the commandline
|
2015-04-30 15:04:06 +01:00 |
|
Mark Haines
|
c9e62927f2
|
Use disable_registration keys if they are present
|
2015-04-30 14:34:09 +01:00 |
|
David Baker
|
d89a9f7283
|
Add an access_log
SYN-161 #resolve
|
2015-04-30 13:58:13 +01:00 |
|
Mark Haines
|
1aa11cf7ce
|
Allow multiple config files, set up a default config before applying the config files
|
2015-04-30 13:48:15 +01:00 |
|
Mark Haines
|
6b69ddd17a
|
remove duplicate parse_size method
|
2015-04-30 04:26:29 +01:00 |
|
Mark Haines
|
d624e2a638
|
Manually generate the default config yaml, remove most of the commandline 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
|
2015-04-30 04:24:44 +01:00 |
|
Mark Haines
|
4ad8b45155
|
Merge branch 'develop' into key_distribution
Conflicts:
synapse/config/homeserver.py
|
2015-04-29 13:15:14 +01:00 |
|
Mark Haines
|
f4c9ebbc34
|
Delete ugly commented out log line.
|
2015-04-29 11:07:13 +01:00 |
|
Matthew Hodgson
|
68c0603946
|
comment out ugly test logline
|
2015-04-29 00:14:44 +01:00 |
|
Erik Johnston
|
327ca883ec
|
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
|
2015-04-28 13:39:42 +01:00 |
|
Mark Haines
|
9182f87664
|
Merge pull request #126 from matrix-org/csauth
Client / Server Auth Refactor
|
2015-04-28 11:00:27 +01:00 |
|
Mark Haines
|
0bc71103e1
|
Output vim style mode markers into the yaml config file
|
2015-04-28 10:17:10 +01:00 |
|
Erik Johnston
|
1ef66cc3bd
|
Move database configuration into config module
|
2015-04-27 15:57:43 +01:00 |
|
Erik Johnston
|
6f8e2d517e
|
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
|
2015-04-27 14:41:40 +01:00 |
|
Mark Haines
|
288702170d
|
Add config for setting the perspective servers
|
2015-04-24 17:01:34 +01:00 |
|
Mark Haines
|
c253b14f6e
|
Merge branch 'develop' into key_distribution
|
2015-04-24 11:29:46 +01:00 |
|
Mark Haines
|
bdcb23ca25
|
Fix spelling
|
2015-04-24 11:29:19 +01:00 |
|
Mark Haines
|
b2c2dc8940
|
Merge branch 'develop' into key_distribution
|
2015-04-24 11:28:10 +01:00 |
|
Mark Haines
|
869dc94cbb
|
Call the super classes when generating config
|
2015-04-24 11:27:56 +01:00 |
|
Mark Haines
|
b1e68add19
|
Add a config file for perspective servers
|
2015-04-24 11:26:19 +01:00 |
|
Mark Haines
|
c8c710eca7
|
Move the key related config parser into a separate file
|
2015-04-24 10:22:22 +01:00 |
|
Mark Haines
|
149ed9f151
|
Better help for the old-signing-key option
|
2015-04-24 10:07:55 +01:00 |
|
David Baker
|
2e0d9219b9
|
Remove now-redundant email config
|
2015-04-23 11:45:29 +01:00 |
|
Mark Haines
|
f30d47c876
|
Implement remote key lookup api
|
2015-04-22 14:21:08 +01:00 |
|
Erik Johnston
|
5e7a90316d
|
Update --database-path metavar to SQLITE_DATABASE_PATH
|
2015-04-17 16:08:18 +01:00 |
|
David Baker
|
cb03fafdf1
|
Merge branch 'develop' into csauth
|
2015-04-17 13:51:10 +01:00 |
|
Erik Johnston
|
6606f7c659
|
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
|
2015-04-15 10:27:20 +01:00 |
|
Mark Haines
|
88cb06e996
|
Update syutil version to 0.0.4
|
2015-04-14 16:18:17 +01:00 |
|
Mark Haines
|
d488463fa3
|
Add a version 2 of the key server api
|
2015-04-14 16:04:52 +01:00 |
|
Erik Johnston
|
d5e7e6b9b6
|
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
|
2015-04-07 18:17:22 +01:00 |
|
Erik Johnston
|
0775c62469
|
Fix --enable-registration flag to work if you don't give a value
|
2015-04-07 18:16:23 +01:00 |
|
Erik Johnston
|
4fe95094d1
|
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
|
2015-04-07 18:05:39 +01:00 |
|
Kegan Dougal
|
af853a4cdb
|
Add AppServiceConfig
|
2015-03-31 09:22:31 +01:00 |
|
David Baker
|
59bf16eddc
|
New registration for C/S API v2. Only ReCAPTCHA working currently.
|
2015-03-30 18:13:10 +01:00 |
|
Matthew Hodgson
|
8366fde82f
|
turn --disable-registration into --enable-registration, given the default is 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
|
2015-03-30 12:01:09 -04:00 |
|
Erik Johnston
|
f6583796fe
|
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
|
2015-03-20 16:31:48 +00:00 |
|
Erik Johnston
|
455579ca90
|
Make database selection configurable
|
2015-03-20 10:55:55 +00:00 |
|
Erik Johnston
|
ed4d44d833
|
Merge pull request #109 from matrix-org/default_registration
Disable registration by default. Add script to register new users.
|
2015-03-18 11:38:52 +00:00 |
|
David Baker
|
7564dac8cb
|
Wire up the webclient option
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.
|
2015-03-17 12:45:37 +01:00 |
|
Erik Johnston
|
8bad40701b
|
Comment.
|
2015-03-16 13:13:07 +00:00 |
|
Erik Johnston
|
98a3825614
|
Allow enabling of registration with --disable-registration false
|
2015-03-13 16:49:18 +00:00 |
|
Erik Johnston
|
9266cb0a22
|
PEP8
|
2015-03-13 15:26:00 +00:00 |
|
Erik Johnston
|
69135f59aa
|
Implement registering with shared secret.
|
2015-03-13 15:23:37 +00:00 |
|
Erik Johnston
|
58367a9da2
|
Disable registration by default
|
2015-03-13 12:59:45 +00:00 |
|
Paul "LeoNerd" Evans
|
b98b4c135d
|
Option to serve metrics from their own localhost-only TCP port instead of muxed on the main listener
|
2015-03-12 16:24:51 +00:00 |
|
Paul "LeoNerd" Evans
|
5b6e11d560
|
Commandline option to enable metrics system
|
2015-03-12 16:24:50 +00:00 |
|
Erik Johnston
|
e49d6b1568
|
Unused import
|
2015-03-06 11:37:24 +00:00 |
|
Erik Johnston
|
3ce8540484
|
Don't look for an TLS private key if we have set --no-tls
|
2015-03-06 11:34:06 +00:00 |
|
Erik Johnston
|
3fce185c77
|
Merge pull request #83 from matrix-org/nofile_limit_config
Add config option to set the soft fd limit on start
|
2015-03-02 13:52:16 +00:00 |
|
Erik Johnston
|
9d9b230501
|
Make the federation server ratelimiting configurable.
|
2015-03-02 11:33:45 +00:00 |
|
David Baker
|
255f989c7b
|
turns uris config options should append since it's a list
|
2015-02-24 20:57:58 +00:00 |
|
Erik Johnston
|
7c56210f20
|
By default set soft limit to hard limit
|
2015-02-20 16:09:44 +00:00 |
|
Erik Johnston
|
81163f822e
|
Add config option to disable registration.
|
2015-02-19 14:16:53 +00:00 |
|
Erik Johnston
|
c3eb7dd9c5
|
Add config option to set the soft fd limit on start
|
2015-02-19 11:50:49 +00:00 |
|
Mark Haines
|
f5a70e0d2e
|
Add a cache for get_event
|
2015-02-11 15:01:15 +00:00 |
|
Erik Johnston
|
f91345bdb5
|
yaml.load expects strings to be a yaml rather than file
|
2015-02-10 13:57:31 +00:00 |
|
Erik Johnston
|
30595b466f
|
Use yaml logging config format because it is much nicer
|
2015-02-10 13:50:33 +00:00 |
|
Mark Haines
|
8ce100c7b4
|
Convert directory paths to absolute paths before daemonizing
|
2015-02-09 18:30:00 +00:00 |
|
Mark Haines
|
3e85e52b3f
|
Allow ':memory:' as the database path for sqlite3
|
2015-01-19 15:26:19 +00:00 |
|
Kegan Dougal
|
9d0dcf2e3c
|
SYN-142: Rotate logs if logging to file. Fixed to a 4 file rotate with 100MB/file for now.
|
2015-01-08 15:31:29 +00:00 |
|
Erik Johnston
|
379a653ae3
|
Add better help message for --server-name config option.
|
2015-01-08 14:32:53 +00:00 |
|
Mark Haines
|
b9f77d1ae1
|
Increase default maximum attachment size to 10M
|
2015-01-06 14:04:58 +00:00 |
|
Mark Haines
|
adb04b1e57
|
Update copyright notices
|
2015-01-06 13:21:39 +00:00 |
|
Kegan Dougal
|
4dcad143dd
|
SYN-142: Use a default log file 'homeserver.log' so people get logging by default.
|
2014-12-16 17:24:49 +00:00 |
|
Erik Johnston
|
3983c7fb0f
|
Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse into develop
|
2014-12-13 18:16:12 +00:00 |
|
Erik Johnston
|
6380ead2ee
|
Fix bug while generating the error message when a file path specified in the config doesn't exist
|
2014-12-13 18:03:01 +00:00 |
|
Mark Haines
|
d80d505b1f
|
Limit the size of images that are thumbnailed serverside. Limit the size of file that a server will download from a remote server
|
2014-12-11 14:19:32 +00:00 |
|
Mark Haines
|
61fc37e467
|
Merge branch 'develop' into media_repository
|
2014-12-10 16:14:17 +00:00 |
|
Paul "LeoNerd" Evans
|
66b0596b7a
|
Don't log synapse.storage at DEBUG level when under -v; require -v -v for that
|
2014-12-02 22:28:18 +00:00 |
|
Mark Haines
|
5da65085d1
|
Get uploads working with new media repo
|
2014-12-02 19:51:47 +00:00 |
|
Mark Haines
|
7993e3d10d
|
SYN-187: Set a more sensible default for the content_addr
|
2014-12-02 17:20:02 +00:00 |
|
David Baker
|
fe3401e037
|
Be more helpful and tell the user how to generate a config too.
|
2014-11-14 13:30:06 +00:00 |
|
David Baker
|
933ce76057
|
Adding --generate-config will not help if the user has not specified a config file.
|
2014-11-14 13:24:12 +00:00 |
|
Mark Haines
|
e903c941cb
|
Merge branch 'develop' into request_logging
Conflicts:
setup.py
synapse/storage/_base.py
synapse/util/async.py
|
2014-11-14 11:16:50 +00:00 |
|
Erik Johnston
|
af7ae048f8
|
Add option to not bind to HTTPS port. This is useful if running behind an ssl load balancer
|
2014-11-03 15:06:40 +00:00 |
|
Mark Haines
|
7c06399512
|
Merge branch 'develop' into request_logging
Conflicts:
synapse/config/logger.py
|
2014-10-30 11:13:58 +00:00 |
|
Mark Haines
|
7d709542ca
|
Fix pep8 warnings
|
2014-10-30 11:10:17 +00:00 |
|
Mark Haines
|
fa955cc2a4
|
Pep8 and a few doc strings
|
2014-10-30 10:13:46 +00:00 |
|
Mark Haines
|
b29517bd01
|
Add a request-id to each log line
|
2014-10-30 01:21:33 +00:00 |
|
Mark Haines
|
d56e389a95
|
Fix pyflakes warnings
|
2014-10-27 10:33:17 +00:00 |
|
Mark Haines
|
9c0826592c
|
Fix auto generating signing_keys
|
2014-10-18 16:56:44 +01:00 |
|
Mark Haines
|
984e207b59
|
Merge branch develop into server2server_signing
Conflicts:
synapse/app/homeserver.py
|
2014-10-13 10:58:50 +01:00 |
|
David Baker
|
9435830351
|
Merge branch 'master' into develop
|
2014-10-02 14:11:17 +01:00 |
|
David Baker
|
d694619a95
|
Fix ncorrect ports in documentation and add notes on how generate-config also generates certs bound to whatever hostname you give with --generate-config.
SYN-87 #resolved
|
2014-10-02 14:09:27 +01:00 |
|
Mark Haines
|
099083ea6b
|
Merge remote-tracking branch 'origin/master' into develop
|
2014-10-02 10:46:41 +01:00 |
|
David Baker
|
7a322b6326
|
Update README setup instructions to be correct. Make synapse spit out explanatory note when generating config to tell people to look at it and customise it.
|
2014-10-02 10:43:22 +01:00 |
|
Mark Haines
|
9605593d11
|
Merge branch 'develop' into server2server_signing
Conflicts:
synapse/storage/__init__.py
tests/rest/test_presence.py
|
2014-09-30 17:55:06 +01:00 |
|
Erik Johnston
|
fbf6320614
|
pyflakes cleanup
|
2014-09-30 12:38:38 +01:00 |
|
David Baker
|
ec5fb77a66
|
Just use a yaml list for turn servers
|
2014-09-25 19:18:32 +02:00 |
|
David Baker
|
c58eb0d5a3
|
Merge branch 'turn' into develop
|
2014-09-25 13:09:56 +01:00 |
|
David Baker
|
a31bf77776
|
Make turn server endpoint return an empty object if no turn servers to
match the normal response. Don't break if the turn_uris option isn't
present.
|
2014-09-25 11:24:49 +02:00 |
|
David Baker
|
5383ba5587
|
rename endpoint to better reflect what it is and allow specifying multiple uris
|
2014-09-24 16:01:36 +01:00 |
|
Mark Haines
|
c6a8e7d9b9
|
Read signing keys using methods from syutil. convert keys that are in the wrong format
|
2014-09-23 18:43:34 +01:00 |
|
David Baker
|
14ed6799d7
|
Add support for TURN servers as per the TURN REST API (http://tools.ietf.org/html/draft-uberti-behave-turn-rest-00)
|
2014-09-23 17:16:13 +01:00 |
|
Paul "LeoNerd" Evans
|
3a8a94448a
|
Allow a (hidden undocumented) key to m.login.recaptcha to specify a shared secret to allow bots to bypass the ReCAPTCHA test (SYN-60)
|
2014-09-23 14:29:08 +01:00 |
|
Kegan Dougal
|
3fa01be9e4
|
formatting
|
2014-09-19 12:04:26 +01:00 |
|
Kegan Dougal
|
cc83b06cd1
|
Added support for the HS to send emails. Use it to send password resets. Added email_smtp_server and email_from_address config args. Added emailutils.
|
2014-09-16 12:36:39 +01:00 |
|
Kegan Dougal
|
37e53513b6
|
Add config opion for XFF headers when performing ReCaptcha auth.
|
2014-09-05 22:51:11 -07:00 |
|
Kegan Dougal
|
0b9e1e7b56
|
Added a captcha config to the HS, to enable registration captcha checking and for the recaptcha private key.
|
2014-09-05 17:58:06 -07:00 |
|
Paul "LeoNerd" Evans
|
4c3512a45c
|
Added a TODO note about YAML modeline for editors
|
2014-09-03 19:30:48 +01:00 |
|
Paul "LeoNerd" Evans
|
4081413876
|
Default PID file should be 'homeserver.pid' to match the other 'homeserver.*' naming convention
|
2014-09-03 17:34:07 +01:00 |
|
Matthew Hodgson
|
8a7c1d6a00
|
fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch.
|
2014-09-03 17:31:57 +01:00 |
|
Mark Haines
|
ee2bcdec65
|
Limit the size of uploads
|
2014-09-03 17:04:16 +01:00 |
|
Erik Johnston
|
bc21350298
|
Add option to change content repo location
|
2014-09-03 11:57:23 +01:00 |
|
Mark Haines
|
c6eafdfbaf
|
Add copyright notices and fix pyflakes errors
|
2014-09-03 09:43:11 +01:00 |
|
Mark Haines
|
780548b577
|
rate limiting for message sending
|
2014-09-02 18:22:15 +01:00 |
|
Mark Haines
|
0a1260b03a
|
Add ratelimiting config
|
2014-09-02 18:00:15 +01:00 |
|
Mark Haines
|
c7a7cdf734
|
Add ratelimiting function to basehandler
|
2014-09-02 17:57:04 +01:00 |
|
Mark Haines
|
cf890e9d43
|
Remove option for disabling webclient because it was confusing
|
2014-09-02 11:09:41 +01:00 |
|
Erik Johnston
|
08d2f902dd
|
Default HTTP and HTTPS ports to 8008 and 8448
|
2014-09-02 10:58:33 +01:00 |
|
Mark Haines
|
45570e4695
|
os.makedirs is almost but not entirely unlike mkdir -p
|
2014-09-02 10:58:05 +01:00 |
|
Mark Haines
|
64b341cc10
|
Fix typo when reading TLS config
|
2014-09-02 10:54:56 +01:00 |
|
Mark Haines
|
30572e28c2
|
Make the config directory if the directory doesn't exisit when generating config
|
2014-09-02 10:52:25 +01:00 |
|
Mark Haines
|
d45f89c95b
|
More helpful error messages for missing config
|
2014-09-02 10:49:11 +01:00 |
|
Mark Haines
|
399e004884
|
Add unsecure listener port to homeserver
|
2014-09-01 22:38:52 +01:00 |
|
Matthew Hodgson
|
61e28cdb6f
|
specify metavars in argparse
|
2014-09-01 22:11:08 +01:00 |
|
Mark Haines
|
6fd730c96b
|
Use yaml for config file
|
2014-09-01 20:44:51 +01:00 |
|
Mark Haines
|
8b69468e5f
|
Use pregenerated DH params when generating config
|
2014-09-01 20:35:18 +01:00 |
|
Mark Haines
|
ef6a8e4f32
|
Listen using SSL
|
2014-09-01 16:30:43 +01:00 |
|
Mark Haines
|
9ea1de432d
|
Fix homeserver config parsing
|
2014-09-01 15:51:15 +01:00 |
|
Mark Haines
|
d9ebe531ed
|
Add config tree to synapse. Add support for reading config from a file
|
2014-08-31 16:06:39 +01:00 |