Merge branch 'develop' into pushers

Conflicts:
	synapse/rest/__init__.py

1 files changed, 16 insertions, 0 deletions

diff --git a/scripts/database-save.sh b/scripts/database-save.sh
new file mode 100755

index 0000000000..040c8a4943
--- /dev/null
+++ b/scripts/database-save.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# This script will write a dump file of local user state if you want to splat
+# your entire server database and start again but preserve the identity of
+# local users and their access tokens.
+#
+# To restore it, use
+#
+#   $ sqlite3 homeserver.db < table-save.sql
+
+sqlite3 "$1" <<'EOF' >table-save.sql
+.dump users
+.dump access_tokens
+.dump presence
+.dump profiles
+EOF