diff --git a/README.rst b/README.rst
index 285fc5aa8a..6136e0c1fe 100644
--- a/README.rst
+++ b/README.rst
@@ -118,7 +118,6 @@ Installing prerequisites on CentOS 7::
python-virtualenv libffi-devel openssl-devel
sudo yum groupinstall "Development Tools"
-
Installing prerequisites on Mac OS X::
xcode-select --install
@@ -150,12 +149,7 @@ In case of problems, please see the _Troubleshooting section below.
Alternatively, Silvio Fricke has contributed a Dockerfile to automate the
above in Docker at https://registry.hub.docker.com/u/silviof/docker-matrix/.
-Another alternative is to install via apt from http://matrix.org/packages/debian/.
-Note that these packages do not include a client - choose one from
-https://matrix.org/blog/try-matrix-now/ (or build your own with
-https://github.com/matrix-org/matrix-js-sdk/).
-
-Finally, Martin Giess has created an auto-deployment process with vagrant/ansible,
+Also, Martin Giess has created an auto-deployment process with vagrant/ansible,
tested with VirtualBox/AWS/DigitalOcean - see https://github.com/EMnify/matrix-synapse-auto-deploy
for details.
@@ -229,6 +223,19 @@ For information on how to install and use PostgreSQL, please see
Platform Specific Instructions
==============================
+Debian
+------
+
+Matrix provides official Debian packages via apt from http://matrix.org/packages/debian/.
+Note that these packages do not include a client - choose one from
+https://matrix.org/blog/try-matrix-now/ (or build your own with one of our SDKs :)
+
+Fedora
+------
+
+Oleg Girko provides Fedora RPMs at
+https://obs.infoserver.lv/project/monitor/matrix-synapse
+
ArchLinux
---------
@@ -270,11 +277,17 @@ During setup of Synapse you need to call python2.7 directly again::
FreeBSD
-------
-Synapse can be installed via FreeBSD Ports or Packages:
+Synapse can be installed via FreeBSD Ports or Packages contributed by Brendan Molloy from:
- Ports: ``cd /usr/ports/net/py-matrix-synapse && make install clean``
- Packages: ``pkg install py27-matrix-synapse``
+NixOS
+-----
+
+Robin Lambertz has packaged Synapse for NixOS at:
+https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/misc/matrix-synapse.nix
+
Windows Install
---------------
Synapse can be installed on Cygwin. It requires the following Cygwin packages:
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 71f7ab3d22..a230dc37f2 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -536,7 +536,9 @@ class RoomMemberHandler(BaseHandler):
if not is_host_in_room:
# perhaps we've been invited
- inviter = self.get_inviter(target_user.to_string(), context.current_state)
+ inviter = self.get_inviter(
+ target_user.to_string(), context.current_state
+ )
if not inviter:
raise SynapseError(404, "Not a known room")
diff --git a/synapse/push/push_rule_evaluator.py b/synapse/push/push_rule_evaluator.py
index 51f73a5b78..c3c2877629 100644
--- a/synapse/push/push_rule_evaluator.py
+++ b/synapse/push/push_rule_evaluator.py
@@ -133,8 +133,9 @@ class PushRuleEvaluator:
enabled = self.enabled_map.get(r['rule_id'], None)
if enabled is not None and not enabled:
continue
-
- if not r.get("enabled", True):
+ elif enabled is None and not r.get("enabled", True):
+ # if no override, check enabled on the rule itself
+ # (may have come from a base rule)
continue
conditions = r['conditions']
diff --git a/synapse/replication/resource.py b/synapse/replication/resource.py
index 69afcb03d2..c51a6fa103 100644
--- a/synapse/replication/resource.py
+++ b/synapse/replication/resource.py
@@ -77,7 +77,7 @@ class ReplicationResource(Resource):
The response is a JSON object with keys for each stream with updates. Under
each key is a JSON object with:
- * "postion": The current position of the stream.
+ * "position": The current position of the stream.
* "field_names": The names of the fields in each row.
* "rows": The updates as an array of arrays.
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index b7ad045e41..dc3e994de9 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -1161,7 +1161,8 @@ class EventsStore(SQLBaseStore):
forward_ex_outliers = []
sql = (
- "SELECT -e.stream_ordering, ej.internal_metadata, ej.json"
+ "SELECT -e.stream_ordering, ej.internal_metadata, ej.json,"
+ " eg.state_group"
" FROM events as e"
" JOIN event_json as ej"
" ON e.event_id = ej.event_id AND e.room_id = ej.room_id"
|
