diff options
| author | Brendan Abolivier <contact@brendanabolivier.com> | 2018-11-23 16:32:56 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-02-13 15:16:02 +0000 |
| commit | 4f7b42c20fcddac90ef2236c955fa76d06973f40 (patch) | |
| tree | 61223012d531f92457426a986b1806a944c9ed2b | |
| parent | Start synapse + proxy in the same container (diff) | |
| download | synapse-4f7b42c20fcddac90ef2236c955fa76d06973f40.tar.xz | |
Update proxy
| -rw-r--r-- | docker/proxy/maps/common_keys.json | 1 | ||||
| -rw-r--r-- | docker/proxy/maps/query_params.json | 15 | ||||
| -rwxr-xr-x | docker/proxy/proxy | bin | 5875600 -> 6296144 bytes | |||
| -rw-r--r-- | docker/supervisord.conf | 2 |
4 files changed, 17 insertions, 1 deletions
diff --git a/docker/proxy/maps/common_keys.json b/docker/proxy/maps/common_keys.json index f26ab397a1..988eb4ddea 100644 --- a/docker/proxy/maps/common_keys.json +++ b/docker/proxy/maps/common_keys.json @@ -13,6 +13,7 @@ "origin", "origin_server_ts", "pdus", + "edus", "sender", "type", "auth_events", diff --git a/docker/proxy/maps/query_params.json b/docker/proxy/maps/query_params.json new file mode 100644 index 0000000000..c5477efcef --- /dev/null +++ b/docker/proxy/maps/query_params.json @@ -0,0 +1,15 @@ +[ + "minimum_valid_until_ts", + "v", + "limit", + "event_id", + "ver", + "limit", + "since", + "include_all_networks", + "third_party_instance_id", + "room_alias", + "user_id", + "field", + "minimum_valid_until_ts" +] diff --git a/docker/proxy/proxy b/docker/proxy/proxy index 20e618af25..1d2d9c3bfe 100755 --- a/docker/proxy/proxy +++ b/docker/proxy/proxy Binary files differdiff --git a/docker/supervisord.conf b/docker/supervisord.conf index b0b2a8fa1f..b9c8cca646 100644 --- a/docker/supervisord.conf +++ b/docker/supervisord.conf @@ -5,4 +5,4 @@ nodaemon=true command=/start.py [program:proxy] -command=/proxy/proxy +command=/proxy/proxy --maps-dir /proxy/maps --no-cbor |