From c7144b105ca0a14ccad6abd1f1f686253a5ee5bc Mon Sep 17 00:00:00 2001
From: Amber Brown <hawkowl@atleastfornow.net>
Date: Fri, 14 Dec 2018 05:10:31 +1100
Subject: [PATCH 01/12] Settings Fix deleting e2e room keys on xenial (#4295)
---
changelog.d/4295.bugfix | 1 +
synapse/storage/e2e_room_keys.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
create mode 100644 changelog.d/4295.bugfix
diff --git a/changelog.d/4295.bugfix b/changelog.d/4295.bugfix
new file mode 100644
index 0000000000..e1603cbcda
--- /dev/null
+++ b/changelog.d/4295.bugfix
@@ -0,0 +1 @@
+Fix deleting E2E room keys when using old SQLite versions.
diff --git a/synapse/storage/e2e_room_keys.py b/synapse/storage/e2e_room_keys.py
index 16b7f005aa..45cebe61d1 100644
--- a/synapse/storage/e2e_room_keys.py
+++ b/synapse/storage/e2e_room_keys.py
@@ -182,7 +182,7 @@ class EndToEndRoomKeyStore(SQLBaseStore):
keyvalues = {
"user_id": user_id,
- "version": version,
+ "version": int(version),
}
if room_id:
keyvalues['room_id'] = room_id
From 128294d3e5ba0a795776023b39049760b2ceaf4d Mon Sep 17 00:00:00 2001
From: Nad Chishtie <n.chishtie@gmail.com>
Date: Thu, 13 Dec 2018 15:42:51 +0000
Subject: [PATCH 02/12] Improved welcome page (#4294)
* Improved static/index.html look, feel and content.
* Added accessibility tags to in-line SVG.
* Grammar.
---
changelog.d/4294.bugfix | 1 +
synapse/static/index.html | 87 ++++++++++++++++++++++++++++-----------
2 files changed, 63 insertions(+), 25 deletions(-)
create mode 100644 changelog.d/4294.bugfix
diff --git a/changelog.d/4294.bugfix b/changelog.d/4294.bugfix
new file mode 100644
index 0000000000..98114869fc
--- /dev/null
+++ b/changelog.d/4294.bugfix
@@ -0,0 +1 @@
+Make the new landing page prettier.
diff --git a/synapse/static/index.html b/synapse/static/index.html
index d664239983..d3f1c7dce0 100644
--- a/synapse/static/index.html
+++ b/synapse/static/index.html
@@ -1,26 +1,63 @@
-<html>
- <head>
- <title>Synapse is running</title>
- <style>
- body {
- width: 30em;
- margin: 0 auto;
- font-family: Tahoma, Verdana, Arial, sans-serif;
- }
- h1 {
- text-align: center;
- }
- </style>
- </head>
- <body>
- <h1>Synapse is running</h1>
- <p>Congratulations!</p>
- <p>Your Synapse server is listening on this port and is ready for messages.</p>
- <p>To use this server you'll need a client - e.g. one of
- <a href="https://matrix.org/docs/projects/try-matrix-now.html#clients">this list of Matrix clients</a>.</p>
- <p>You can find (federated) rooms that might be of interest to you on
- <a href="https://view.matrix.org/">view.matrix.org</a>.</p>
- <p>Or you just start creating your own rooms with your friends.</p>
- <p>Welcome to the Matrix universe :)</p>
- </body>
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <title>Synapse is running</title>
+ <style>
+ body {
+ font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
+ max-width: 40em;
+ margin: auto;
+ text-align: center;
+ }
+ h1, p {
+ margin: 1.5em;
+ }
+ hr {
+ border: none;
+ background-color: #ccc;
+ color: #ccc;
+ height: 1px;
+ width: 7em;
+ margin-top: 4em;
+ }
+ .logo {
+ display: block;
+ width: 12em;
+ margin: 4em auto;
+ }
+ </style>
+ </head>
+ <body>
+ <div class="logo">
+ <svg role="img" aria-label="[Matrix logo]" viewBox="0 0 200 85" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <g id="parent" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+ <g id="child" transform="translate(-122.000000, -6.000000)" fill="#000000" fill-rule="nonzero">
+ <g id="matrix-logo" transform="translate(122.000000, 6.000000)">
+ <polygon id="left-bracket" points="2.24708861 1.93811009 2.24708861 82.7268844 8.10278481 82.7268844 8.10278481 84.6652459 0 84.6652459 0 0 8.10278481 0 8.10278481 1.93811009"></polygon>
+ <path d="M24.8073418,27.5493174 L24.8073418,31.6376991 L24.924557,31.6376991 C26.0227848,30.0814294 27.3455696,28.8730642 28.8951899,28.0163743 C30.4437975,27.1611927 32.2189873,26.7318422 34.218481,26.7318422 C36.1394937,26.7318422 37.8946835,27.102622 39.4825316,27.8416679 C41.0708861,28.5819706 42.276962,29.8856073 43.1005063,31.7548404 C44.0017722,30.431345 45.2270886,29.2629486 46.7767089,28.2506569 C48.3253165,27.2388679 50.158481,26.7318422 52.2764557,26.7318422 C53.8843038,26.7318422 55.3736709,26.9269101 56.7473418,27.3162917 C58.1189873,27.7056734 59.295443,28.3285835 60.2759494,29.185022 C61.255443,30.0422147 62.02,31.1615927 62.5701266,32.5426532 C63.1187342,33.9262275 63.3936709,35.5898349 63.3936709,37.5372459 L63.3936709,57.7443688 L55.0410127,57.7441174 L55.0410127,40.6319376 C55.0410127,39.6201486 55.0020253,38.6661761 54.9232911,37.7700202 C54.8440506,36.8751211 54.6293671,36.0968606 54.2764557,35.4339817 C53.9232911,34.772611 53.403038,34.2464807 52.7177215,33.8568477 C52.0313924,33.4689743 51.0997468,33.2731523 49.9235443,33.2731523 C48.7473418,33.2731523 47.7962025,33.4983853 47.0706329,33.944578 C46.344557,34.393033 45.7764557,34.9774826 45.3650633,35.6969211 C44.9534177,36.4181193 44.6787342,37.2353431 44.5417722,38.150855 C44.4037975,39.0653615 44.3356962,39.9904257 44.3356962,40.9247908 L44.3356962,57.7443688 L35.9835443,57.7443688 L35.9835443,40.8079009 C35.9835443,39.9124991 35.963038,39.0263982 35.9253165,38.150855 C35.8853165,37.2743064 35.7192405,36.4666349 35.424557,35.7263321 C35.1303797,34.9872862 34.64,34.393033 33.9539241,33.944578 C33.2675949,33.4983853 32.2579747,33.2731523 30.9248101,33.2731523 C30.5321519,33.2731523 30.0126582,33.3608826 29.3663291,33.5365945 C28.7192405,33.7118037 28.0913924,34.0433688 27.4840506,34.5292789 C26.875443,35.0164459 26.3564557,35.7172826 25.9250633,36.6315376 C25.4934177,37.5470495 25.2779747,38.7436 25.2779747,40.2229486 L25.2779747,57.7441174 L16.9260759,57.7443688 L16.9260759,27.5493174 L24.8073418,27.5493174 Z" id="m"></path>
+ <path d="M68.7455696,31.9886202 C69.6075949,30.7033339 70.7060759,29.672189 72.0397468,28.8926716 C73.3724051,28.1141596 74.8716456,27.5596239 76.5387342,27.2283101 C78.2050633,26.8977505 79.8817722,26.7315908 81.5678481,26.7315908 C83.0974684,26.7315908 84.6458228,26.8391798 86.2144304,27.0525982 C87.7827848,27.2675248 89.2144304,27.6865688 90.5086076,28.3087248 C91.8025316,28.9313835 92.8610127,29.7983798 93.6848101,30.9074514 C94.5083544,32.0170257 94.92,33.4870734 94.92,35.3173431 L94.92,51.026844 C94.92,52.3913138 94.998481,53.6941963 95.1556962,54.9400165 C95.3113924,56.1865908 95.5863291,57.120956 95.9787342,57.7436147 L87.5091139,57.7436147 C87.3518987,57.276055 87.2240506,56.7996972 87.1265823,56.3125303 C87.0278481,55.8266202 86.9592405,55.3301523 86.9207595,54.8236294 C85.5873418,56.1865908 84.0182278,57.1405633 82.2156962,57.6857982 C80.4113924,58.2295248 78.5683544,58.503022 76.6860759,58.503022 C75.2346835,58.503022 73.8817722,58.3275615 72.6270886,57.9776459 C71.3718987,57.6269761 70.2744304,57.082244 69.3334177,56.3411872 C68.3921519,55.602644 67.656962,54.6680275 67.1275949,53.5390972 C66.5982278,52.410167 66.3331646,51.065556 66.3331646,49.5087835 C66.3331646,47.7961578 66.6367089,46.384178 67.2455696,45.2756092 C67.8529114,44.1652807 68.6367089,43.2799339 69.5987342,42.6173064 C70.5589873,41.9556844 71.6567089,41.4592165 72.8924051,41.1284055 C74.1273418,40.7978459 75.3721519,40.5356606 76.6270886,40.3398385 C77.8820253,40.1457761 79.116962,39.9896716 80.3329114,39.873033 C81.5483544,39.7558917 82.6270886,39.5804312 83.5681013,39.3469028 C84.5093671,39.1133743 85.2536709,38.7732624 85.8032911,38.3250587 C86.3513924,37.8773578 86.6063291,37.2252881 86.5678481,36.3680954 C86.5678481,35.4731963 86.4210127,34.7620532 86.1268354,34.2366771 C85.8329114,33.7113009 85.4405063,33.3018092 84.9506329,33.0099615 C84.4602532,32.7181138 83.8916456,32.5232972 83.2450633,32.4255119 C82.5977215,32.3294862 81.9010127,32.2797138 81.156962,32.2797138 C79.5098734,32.2797138 78.2159494,32.6303835 77.2746835,33.3312202 C76.3339241,34.0320569 75.7837975,35.2007046 75.6275949,36.8354037 L67.275443,36.8354037 C67.3924051,34.8892495 67.8817722,33.2726495 68.7455696,31.9886202 Z M85.2440506,43.6984752 C84.7149367,43.873433 84.1460759,44.0189798 83.5387342,44.1361211 C82.9306329,44.253011 82.2936709,44.350545 81.6270886,44.4279688 C80.96,44.5066495 80.2934177,44.6034294 79.6273418,44.7203193 C78.9994937,44.8362037 78.3820253,44.9933138 77.7749367,45.1871248 C77.1663291,45.3829468 76.636962,45.6451321 76.1865823,45.9759431 C75.7349367,46.3070055 75.3724051,46.7263009 75.0979747,47.2313156 C74.8232911,47.7375872 74.6863291,48.380356 74.6863291,49.1588679 C74.6863291,49.8979138 74.8232911,50.5218294 75.0979747,51.026844 C75.3724051,51.5338697 75.7455696,51.9328037 76.2159494,52.2246514 C76.6863291,52.5164991 77.2349367,52.7213706 77.8632911,52.8375064 C78.4898734,52.9546477 79.136962,53.012967 79.8037975,53.012967 C81.4506329,53.012967 82.724557,52.740978 83.6273418,52.1952404 C84.5288608,51.6507596 85.1949367,50.9981872 85.6270886,50.2382771 C86.0579747,49.4793725 86.323038,48.7119211 86.4212658,47.9321523 C86.518481,47.1536404 86.5681013,46.5304789 86.5681013,46.063422 L86.5681013,42.9677248 C86.2146835,43.2799339 85.7736709,43.5230147 85.2440506,43.6984752 Z" id="a"></path>
+ <path d="M116.917975,27.5493174 L116.917975,33.0976917 L110.801266,33.0976917 L110.801266,48.0492936 C110.801266,49.4502128 111.036203,50.3850807 111.507089,50.8518862 C111.976962,51.3191945 112.918734,51.5527229 114.33038,51.5527229 C114.801013,51.5527229 115.251392,51.5336183 115.683038,51.4944037 C116.114177,51.4561945 116.526076,51.3968697 116.917975,51.3194459 L116.917975,57.7438661 C116.212152,57.860756 115.427595,57.9381798 114.565316,57.9778972 C113.702785,58.0153523 112.859747,58.0357138 112.036203,58.0357138 C110.742278,58.0357138 109.516456,57.9477321 108.36,57.7722716 C107.202785,57.5975651 106.183544,57.2577046 105.301519,56.7509303 C104.418987,56.2454128 103.722785,55.5242147 103.213418,54.5898495 C102.703038,53.6562385 102.448608,52.4292716 102.448608,50.9099541 L102.448608,33.0976917 L97.3903797,33.0976917 L97.3903797,27.5493174 L102.448608,27.5493174 L102.448608,18.4967596 L110.801013,18.4967596 L110.801013,27.5493174 L116.917975,27.5493174 Z" id="t"></path>
+ <path d="M128.857975,27.5493174 L128.857975,33.1565138 L128.975696,33.1565138 C129.367089,32.2213945 129.896203,31.3559064 130.563544,30.557033 C131.23038,29.7596679 131.99443,29.0776844 132.857215,28.5130936 C133.719241,27.9495083 134.641266,27.5113596 135.622532,27.1988991 C136.601772,26.8879468 137.622025,26.7315908 138.681013,26.7315908 C139.229873,26.7315908 139.836962,26.8296275 140.504304,27.0239413 L140.504304,34.7336477 C140.111646,34.6552183 139.641013,34.586844 139.092658,34.5290275 C138.543291,34.4704569 138.014177,34.4410459 137.504304,34.4410459 C135.974937,34.4410459 134.681013,34.6949358 133.622785,35.2004532 C132.564051,35.7067248 131.711392,36.397255 131.064051,37.2735523 C130.417215,38.1501009 129.955443,39.1714422 129.681266,40.3398385 C129.407089,41.5074807 129.269873,42.7736624 129.269873,44.1361211 L129.269873,57.7438661 L120.917722,57.7438661 L120.917722,27.5493174 L128.857975,27.5493174 Z" id="r"></path>
+ <path d="M144.033165,22.8767376 L144.033165,16.0435798 L152.386076,16.0435798 L152.386076,22.8767376 L144.033165,22.8767376 Z M152.386076,27.5493174 L152.386076,57.7438661 L144.033165,57.7438661 L144.033165,27.5493174 L152.386076,27.5493174 Z" id="i"></path>
+ <polygon id="x" points="156.738228 27.5493174 166.266582 27.5493174 171.619494 35.4337303 176.913418 27.5493174 186.147848 27.5493174 176.148861 41.6831927 187.383544 57.7441174 177.85443 57.7441174 171.501772 48.2245028 165.148861 57.7441174 155.797468 57.7441174 166.737468 41.8589046"></polygon>
+ <polygon id="right-bracket" points="197.580759 82.7268844 197.580759 1.93811009 191.725063 1.93811009 191.725063 0 199.828354 0 199.828354 84.6652459 191.725063 84.6652459 191.725063 82.7268844"></polygon>
+ </g>
+ </g>
+ </g>
+ </svg>
+ </div>
+ <h1>It works! Synapse is running</h1>
+ <p>Your Synapse server is listening on this port and is ready for messages.</p>
+ <p>To use this server you'll need <a href="https://matrix.org/docs/projects/try-matrix-now.html#clients" target="_blank">a Matrix client</a>.
+ </p>
+ <p>Welcome to the Matrix universe :)</p>
+ <hr>
+ <p>
+ <small>
+ <a href="https://matrix.org" target="_blank">
+ matrix.org
+ </a>
+ </small>
+ </p>
+ </body>
</html>
From 1c0051114a53ddacfa13bb07f72b21a3c9ef2457 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Mon, 10 Dec 2018 17:05:02 +0000
Subject: [PATCH 03/12] Add 'sandbox' to CSP for media repo (#4284)
* Add 'sandbox' to the CSP for media repo
* Changelog
---
changelog.d/4284.bugfix | 1 +
synapse/rest/media/v1/download_resource.py | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
create mode 100644 changelog.d/4284.bugfix
diff --git a/changelog.d/4284.bugfix b/changelog.d/4284.bugfix
new file mode 100644
index 0000000000..4a9478fa28
--- /dev/null
+++ b/changelog.d/4284.bugfix
@@ -0,0 +1 @@
+Add 'sandbox' to CSP for media reprository
diff --git a/synapse/rest/media/v1/download_resource.py b/synapse/rest/media/v1/download_resource.py
index f911b120b1..bdc5daecc1 100644
--- a/synapse/rest/media/v1/download_resource.py
+++ b/synapse/rest/media/v1/download_resource.py
@@ -48,7 +48,8 @@ class DownloadResource(Resource):
set_cors_headers(request)
request.setHeader(
b"Content-Security-Policy",
- b"default-src 'none';"
+ b"sandbox;"
+ b" default-src 'none';"
b" script-src 'none';"
b" plugin-types application/pdf;"
b" style-src 'unsafe-inline';"
From fd4070a85dc4ece77f2427b586c18bb1f4a04197 Mon Sep 17 00:00:00 2001
From: Amber Brown <hawkowl@atleastfornow.net>
Date: Tue, 11 Dec 2018 04:14:34 +1100
Subject: [PATCH 04/12] import from package-debian-synapse
---
debian/changelog | 630 ++++++++++++++++++
debian/compat | 1 +
debian/config | 9 +
debian/control | 77 +++
debian/copyright | 118 ++++
debian/dirs | 3 +
debian/gbp.conf | 5 +
debian/hash_password.1 | 90 +++
debian/hash_password.ronn | 69 ++
debian/homeserver.yaml | 621 +++++++++++++++++
debian/install | 2 +
debian/log.yaml | 35 +
debian/manpages | 4 +
debian/matrix-synapse.default | 2 +
debian/matrix-synapse.init | 184 +++++
debian/matrix-synapse.service | 15 +
debian/patches/0001-tox.patch | 19 +
debian/patches/0002-change_instructions.patch | 34 +
.../patches/0004-webclient-instructions.patch | 27 +
...equire-strict-nacl-0.3.0-requirement.patch | 21 +
debian/patches/bcrypt.patch | 30 +
debian/patches/no_install_with_pip | 43 ++
debian/patches/remove-webclient.patch | 31 +
debian/patches/series | 7 +
debian/po/POTFILES.in | 1 +
debian/po/templates.pot | 56 ++
debian/postinst | 39 ++
debian/pydist-overrides | 5 +
debian/register_new_matrix_user.1 | 72 ++
debian/register_new_matrix_user.ronn | 61 ++
debian/rules | 18 +
debian/source/format | 1 +
debian/synapse_port_db.1 | 98 +++
debian/synapse_port_db.ronn | 87 +++
debian/synctl.1 | 63 ++
debian/synctl.ronn | 70 ++
debian/templates | 19 +
debian/watch | 11 +
38 files changed, 2678 insertions(+)
create mode 100644 debian/changelog
create mode 100644 debian/compat
create mode 100755 debian/config
create mode 100644 debian/control
create mode 100644 debian/copyright
create mode 100644 debian/dirs
create mode 100644 debian/gbp.conf
create mode 100644 debian/hash_password.1
create mode 100644 debian/hash_password.ronn
create mode 100644 debian/homeserver.yaml
create mode 100644 debian/install
create mode 100644 debian/log.yaml
create mode 100644 debian/manpages
create mode 100644 debian/matrix-synapse.default
create mode 100755 debian/matrix-synapse.init
create mode 100644 debian/matrix-synapse.service
create mode 100644 debian/patches/0001-tox.patch
create mode 100644 debian/patches/0002-change_instructions.patch
create mode 100644 debian/patches/0004-webclient-instructions.patch
create mode 100644 debian/patches/0006-Don-t-require-strict-nacl-0.3.0-requirement.patch
create mode 100644 debian/patches/bcrypt.patch
create mode 100644 debian/patches/no_install_with_pip
create mode 100644 debian/patches/remove-webclient.patch
create mode 100644 debian/patches/series
create mode 100644 debian/po/POTFILES.in
create mode 100644 debian/po/templates.pot
create mode 100755 debian/postinst
create mode 100644 debian/pydist-overrides
create mode 100644 debian/register_new_matrix_user.1
create mode 100644 debian/register_new_matrix_user.ronn
create mode 100755 debian/rules
create mode 100644 debian/source/format
create mode 100644 debian/synapse_port_db.1
create mode 100644 debian/synapse_port_db.ronn
create mode 100644 debian/synctl.1
create mode 100644 debian/synctl.ronn
create mode 100644 debian/templates
create mode 100644 debian/watch
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000000..20167978cf
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,630 @@
+matrix-synapse (0.33.9-1matrix1) stretch; urgency=medium
+
+ [ Erik Johnston ]
+ * Remove dependency on python-pydenticon
+
+ [ Richard van der Hoff ]
+ * New upstream version 0.33.9
+ * Refresh patches for 0.33.9
+
+ -- Richard van der Hoff <richard@matrix.org> Tue, 20 Nov 2018 10:26:05 +0000
+
+matrix-synapse (0.33.8-1) stretch; urgency=medium
+
+ * New upstream version 0.33.8
+
+ -- Erik Johnston <erik@matrix.org> Thu, 01 Nov 2018 14:33:26 +0000
+
+matrix-synapse (0.33.7-1matrix1) stretch; urgency=medium
+
+ * New upstream version 0.33.7
+
+ -- Richard van der Hoff <richard@matrix.org> Thu, 18 Oct 2018 16:18:26 +0100
+
+matrix-synapse (0.33.6-1matrix1) stretch; urgency=medium
+
+ * Imported Upstream version 0.33.6
+ * Remove redundant explicit dep on python-bcrypt
+ * Run the tests during build
+ * Add dependency on python-attr 16.0
+ * Refresh patches for 0.33.6
+
+ -- Richard van der Hoff <richard@matrix.org> Thu, 04 Oct 2018 14:40:29 +0100
+
+matrix-synapse (0.33.5.1-1matrix1) stretch; urgency=medium
+
+ * Imported Upstream version 0.33.5.1
+
+ -- Richard van der Hoff <richard@matrix.org> Mon, 24 Sep 2018 18:20:51 +0100
+
+matrix-synapse (0.33.5-1matrix1) stretch; urgency=medium
+
+ * Imported Upstream version 0.33.5
+
+ -- Richard van der Hoff <richard@matrix.org> Mon, 24 Sep 2018 16:06:23 +0100
+
+matrix-synapse (0.33.4-1mx1) stretch; urgency=medium
+
+ * Imported Upstream version 0.33.4
+ * Avoid telling people to install packages with pip
+ (fixes https://github.com/matrix-org/synapse/issues/3743)
+
+ -- Richard van der Hoff <richard@matrix.org> Fri, 07 Sep 2018 14:06:17 +0100
+
+matrix-synapse (0.33.3.1-1mx1) stretch; urgency=critical
+
+ [ Richard van der Hoff ]
+ * Imported Upstream version 0.33.3.1
+
+ -- Richard van der Hoff <richard@matrix.org> Thu, 06 Sep 2018 11:20:37 +0100
+
+matrix-synapse (0.33.3-2) stretch; urgency=medium
+
+ * We now require python-twisted 17.1.0 or later
+ * Add recommendations for python-psycopg2 and python-lxml
+
+ -- Richard van der Hoff <richard@matrix.org> Thu, 23 Aug 2018 19:04:08 +0100
+
+matrix-synapse (0.33.3-1) jessie; urgency=medium
+
+ * New upstream version 0.33.3
+
+ -- Richard van der Hoff <richard@matrix.org> Wed, 22 Aug 2018 14:50:30 +0100
+
+matrix-synapse (0.33.2-1) jessie; urgency=medium
+
+ * New upstream version 0.33.2
+
+ -- Richard van der Hoff <richard@matrix.org> Thu, 09 Aug 2018 15:40:42 +0100
+
+matrix-synapse (0.33.1-1) jessie; urgency=medium
+
+ * New upstream version 0.33.1
+
+ -- Erik Johnston <erik@matrix.org> Thu, 02 Aug 2018 15:52:19 +0100
+
+matrix-synapse (0.33.0-1) jessie; urgency=medium
+
+ * New upstream version 0.33.0
+
+ -- Richard van der Hoff <richard@matrix.org> Thu, 19 Jul 2018 13:38:41 +0100
+
+matrix-synapse (0.32.1-1) jessie; urgency=medium
+
+ * New upstream version 0.32.1
+
+ -- Richard van der Hoff <richard@matrix.org> Fri, 06 Jul 2018 17:16:29 +0100
+
+matrix-synapse (0.32.0-1) jessie; urgency=medium
+
+ * New upstream version 0.32.0
+
+ -- Erik Johnston <erik@matrix.org> Fri, 06 Jul 2018 15:34:06 +0100
+
+matrix-synapse (0.31.2-1) jessie; urgency=high
+
+ * New upstream version 0.31.2
+
+ -- Richard van der Hoff <richard@matrix.org> Thu, 14 Jun 2018 16:49:07 +0100
+
+matrix-synapse (0.31.1-1) jessie; urgency=medium
+
+ * New upstream version 0.31.1
+ * Require python-prometheus-client >= 0.0.14
+
+ -- Richard van der Hoff <richard@matrix.org> Fri, 08 Jun 2018 16:11:55 +0100
+
+matrix-synapse (0.31.0-1) jessie; urgency=medium
+
+ * New upstream version 0.31.0
+
+ -- Richard van der Hoff <richard@matrix.org> Wed, 06 Jun 2018 17:23:10 +0100
+
+matrix-synapse (0.30.0-1) jessie; urgency=medium
+
+ [ Michael Kaye ]
+ * update homeserver.yaml to be somewhat more modern.
+
+ [ Erik Johnston ]
+ * New upstream version 0.30.0
+
+ -- Erik Johnston <erik@matrix.org> Thu, 24 May 2018 16:43:16 +0100
+
+matrix-synapse (0.29.0-1) jessie; urgency=medium
+
+ * New upstream version 0.29.0
+
+ -- Erik Johnston <erik@matrix.org> Wed, 16 May 2018 17:43:06 +0100
+
+matrix-synapse (0.28.1-1) jessie; urgency=medium
+
+ * New upstream version 0.28.1
+
+ -- Erik Johnston <erik@matrix.org> Tue, 01 May 2018 19:21:39 +0100
+
+matrix-synapse (0.28.0-1) jessie; urgency=medium
+
+ * New upstream 0.28.0
+
+ -- Erik Johnston <erik@matrix.org> Fri, 27 Apr 2018 13:15:49 +0100
+
+matrix-synapse (0.27.4-1) jessie; urgency=medium
+
+ * Bump canonicaljson version
+ * New upstream 0.27.4
+
+ -- Erik Johnston <erik@matrix.org> Fri, 13 Apr 2018 13:37:47 +0100
+
+matrix-synapse (0.27.3-1) jessie; urgency=medium
+
+ * Report stats should default to off
+ * Refresh patches
+ * New upstream 0.27.3
+
+ -- Erik Johnston <erik@matrix.org> Wed, 11 Apr 2018 11:43:47 +0100
+
+matrix-synapse (0.27.2-1) jessie; urgency=medium
+
+ * New upstream version 0.27.2
+
+ -- Erik Johnston <erik@matrix.org> Mon, 26 Mar 2018 16:41:57 +0100
+
+matrix-synapse (0.27.1-1) jessie; urgency=medium
+
+ * New upstream version 0.27.1
+
+ -- Erik Johnston <erik@matrix.org> Mon, 26 Mar 2018 16:22:03 +0100
+
+matrix-synapse (0.27.0-2) jessie; urgency=medium
+
+ * Fix bcrypt dependency
+
+ -- Erik Johnston <erik@matrix.org> Mon, 26 Mar 2018 16:00:26 +0100
+
+matrix-synapse (0.27.0-1) jessie; urgency=medium
+
+ * New upstream version 0.27.0
+
+ -- Erik Johnston <erik@matrix.org> Mon, 26 Mar 2018 15:07:52 +0100
+
+matrix-synapse (0.26.1-1) jessie; urgency=medium
+
+ * Ignore RC
+ * New upstream version 0.26.1
+
+ -- Erik Johnston <erik@matrix.org> Fri, 16 Mar 2018 00:40:08 +0000
+
+matrix-synapse (0.26.0-1) jessie; urgency=medium
+
+ [ Richard van der Hoff ]
+ * Remove `level` for `file` log handler
+
+ [ Erik Johnston ]
+
+ -- Erik Johnston <erik@matrix.org> Fri, 05 Jan 2018 11:21:26 +0000
+
+matrix-synapse (0.25.1-1) jessie; urgency=medium
+
+ * New upstream version 0.25.1
+
+ -- Erik Johnston <erik@matrix.org> Mon, 20 Nov 2017 10:05:37 +0000
+
+matrix-synapse (0.25.0-1) jessie; urgency=medium
+
+ * New upstream version 0.25.0
+
+ -- Erik Johnston <erik@matrix.org> Wed, 15 Nov 2017 11:36:32 +0000
+
+matrix-synapse (0.24.1-1) jessie; urgency=medium
+
+ * New upstream version 0.24.1
+
+ -- Erik Johnston <erik@matrix.org> Tue, 24 Oct 2017 15:05:03 +0100
+
+matrix-synapse (0.24.0-1) jessie; urgency=medium
+
+ * New upstream version 0.24.0
+
+ -- Erik Johnston <erik@matrix.org> Mon, 23 Oct 2017 14:11:46 +0100
+
+matrix-synapse (0.23.1-1) xenial; urgency=medium
+
+ * Imported upstream version 0.23.1
+
+ -- Erik Johnston <erikj@matrix.org> Thu, 05 Oct 2017 15:28:25 +0100
+
+matrix-synapse (0.23.0-1) jessie; urgency=medium
+
+ * Fix patch after refactor
+ * Add patch to remove requirement on affinity package
+ * refresh webclient patch
+
+ -- Erik Johnston <erikj@matrix.org> Mon, 02 Oct 2017 15:34:57 +0100
+
+matrix-synapse (0.22.1-1) jessie; urgency=medium
+
+ * Imported Upstream version 0.22.1
+
+ -- Erik Johnston <erikj@matrix.org> Thu, 06 Jul 2017 18:14:13 +0100
+
+matrix-synapse (0.22.0-1) jessie; urgency=medium
+
+ * Imported upstream version 0.22.0
+
+ -- Erik Johnston <erikj@matrix.org> Thu, 06 Jul 2017 10:47:45 +0100
+
+matrix-synapse (0.21.1-1) jessie; urgency=medium
+
+ * Imported upstream version 0.21.1
+
+ -- Erik Johnston <erikj@matrix.org> Thu, 15 Jun 2017 13:31:13 +0100
+
+matrix-synapse (0.21.0-1) jessie; urgency=medium
+
+ * Imported upstream version 0.21.0
+ * Update patches
+
+ -- Erik Johnston <erikj@matrix.org> Thu, 18 May 2017 14:16:54 +0100
+
+matrix-synapse (0.20.0-2) jessie; urgency=medium
+
+ * Depend on python-jsonschema
+
+ -- Erik Johnston <erikj@matrix.org> Wed, 12 Apr 2017 10:41:46 +0100
+
+matrix-synapse (0.20.0-1) jessie; urgency=medium
+
+ * Imported upstream version 0.20.0
+
+ -- Erik Johnston <erikj@matrix.org> Tue, 11 Apr 2017 12:58:26 +0100
+
+matrix-synapse (0.19.3-1) jessie; urgency=medium
+
+ * Imported upstream version 0.19.3
+
+ -- Erik Johnston <erikj@matrix.org> Tue, 21 Mar 2017 13:45:41 +0000
+
+matrix-synapse (0.19.2-1) jessie; urgency=medium
+
+ [ Sunil Mohan Adapa ]
+ * Bump standards version to 3.9.8
+ * Add debian/copyright file
+ * Don't ignore errors in debian/config
+ * Reformat depenedencies in debian/control
+ * Internationalize strings in template file
+ * Update package description
+ * Add lsb-base as dependency
+ * Update questions for debconf style
+ * Add man pages for all binaries
+
+ [ Erik Johnston ]
+ * Imported upstream version 0.19.2
+
+ -- Erik Johnston <erikj@matrix.org> Tue, 21 Feb 2017 13:55:00 +0000
+
+matrix-synapse (0.19.1-1) jessie; urgency=medium
+
+ * Imported upstream version 0.19.1
+
+ -- Erik Johnston <erikj@matrix.org> Thu, 09 Feb 2017 11:53:27 +0000
+
+matrix-synapse (0.19.0-1) jessie; urgency=medium
+
+ This build requires python-twisted 0.19.0, which may need to be installed
+ from backports.
+
+ [ Bryce Chidester ]
+ * Add EnvironmentFile to the systemd service
+ * Create matrix-synapse.default
+
+ [ Erik Johnston ]
+ * Imported upstream version 0.19.0
+
+ -- Erik Johnston <erikj@matrix.org> Sat, 04 Feb 2017 09:58:29 +0000
+
+matrix-synapse (0.18.7-1) trusty; urgency=medium
+
+ * Imported Upstream version 0.18.4
+
+ -- Erik Johnston <erikj@matrix.org> Mon, 09 Jan 2017 15:10:21 +0000
+
+matrix-synapse (0.18.5-1) trusty; urgency=medium
+
+ * Imported Upstream version 0.18.5
+
+ -- Erik Johnston <erikj@matrix.org> Fri, 16 Dec 2016 10:51:59 +0000
+
+matrix-synapse (0.18.4-1) trusty; urgency=medium
+
+ * Imported Upstream version 0.18.4
+
+ -- Erik Johnston <erikj@matrix.org> Tue, 22 Nov 2016 10:33:41 +0000
+
+matrix-synapse (0.18.3-1) trusty; urgency=medium
+
+ * Imported Upstream version 0.18.3
+ * Remove upstreamed ldap3 patch
+
+ -- Erik Johnston <erikj@matrix.org> Tue, 08 Nov 2016 15:01:49 +0000
+
+matrix-synapse (0.18.2-2) trusty; urgency=high
+
+ * Patch ldap3 support to workaround differences in python-ldap3 0.9,
+ bug allowed unauthorized logins if ldap3 0.9 was used.
+
+ -- Erik Johnston <erikj@matrix.org> Tue, 08 Nov 2016 13:48:09 +0000
+
+matrix-synapse (0.18.2-1) trusty; urgency=medium
+
+ * Imported Upstream version 0.18.2
+
+ -- Erik Johnston <erikj@matrix.org> Tue, 01 Nov 2016 13:30:45 +0000
+
+matrix-synapse (0.18.1-1) trusty; urgency=medium
+
+ * Imported Upstream version 0.18.1
+
+ -- Erik Johnston <erikj@matrix.org> Wed, 05 Oct 2016 14:52:53 +0100
+
+matrix-synapse (0.18.0-1) trusty; urgency=medium
+
+ * Imported Upstream version 0.18.0
+
+ -- Erik Johnston <erikj@matrix.org> Mon, 19 Sep 2016 17:38:48 +0100
+
+matrix-synapse (0.17.3-1) trusty; urgency=medium
+
+ * Imported Upstream version 0.17.3
+
+ -- Erik Johnston <erikj@matrix.org> Fri, 09 Sep 2016 11:18:18 +0100
+
+matrix-synapse (0.17.2-1) trusty; urgency=medium
+
+ * Imported Upstream version 0.17.2
+
+ -- Erik Johnston <erikj@matrix.org> Thu, 08 Sep 2016 15:37:14 +0100
+
+matrix-synapse (0.17.1-1) trusty; urgency=medium
+
+ * Imported Upstream version 0.17.1
+
+ -- Erik Johnston <erikj@matrix.org> Wed, 24 Aug 2016 15:11:29 +0100
+
+matrix-synapse (0.17.0-1) trusty; urgency=medium
+
+ * Imported Upstream version 0.17.0
+
+ -- Erik Johnston <erikj@matrix.org> Mon, 08 Aug 2016 13:56:15 +0100
+
+matrix-synapse (0.16.1-r1-1) trusty; urgency=medium
+
+ * Imported Upstream version 0.16.1-r1
+
+ -- Erik Johnston <erikj@matrix.org> Fri, 08 Jul 2016 16:47:35 +0100
+
+matrix-synapse (0.16.1-2) trusty; urgency=critical
+
+ * Apply security patch
+
+ -- Erik Johnston <erikj@matrix.org> Fri, 08 Jul 2016 11:05:27 +0100
+
+matrix-synapse (0.16.1-1) trusty; urgency=medium
+
+ * New upstream release
+
+ -- Erik Johnston <erikj@matrix.org> Tue, 21 Jun 2016 14:56:48 +0100
+
+matrix-synapse (0.16.0-3) trusty; urgency=medium
+
+ * Don't require strict nacl==0.3.0 requirement
+
+ -- Erik Johnston <erikj@matrix.org> Mon, 20 Jun 2016 13:24:22 +0100
+
+matrix-synapse (0.16.0-2) trusty; urgency=medium
+
+ * Also change the permissions of /etc/matrix-synapse
+ * Add apt webclient instructions
+ * Fix up patches
+ * Update default homeserver.yaml
+ * Add patch
+
+ -- Erik Johnston <erikj@matrix.org> Fri, 10 Jun 2016 14:06:20 +0100
+
+matrix-synapse (0.16.0-1) trusty; urgency=medium
+
+ [ David A Roberts ]
+ * systemd
+
+ [ Erik Johnston ]
+ * Fixup postinst and matrix-synapse.service
+ * Handle email optional deps
+ * New upstream release
+
+ -- Erik Johnston <erikj@matrix.org> Thu, 09 Jun 2016 16:17:01 +0100
+
+matrix-synapse (0.14.0-1) trusty; urgency=medium
+
+ * Remove saml2 module requirements
+
+ -- Erik Johnston <erikj@matrix.org> Wed, 30 Mar 2016 14:31:17 +0100
+
+matrix-synapse (0.13.3-1) trusty; urgency=medium
+
+ * New upstream release
+
+ -- Erik Johnston <erikj@matrix.org> Thu, 11 Feb 2016 16:35:39 +0000
+
+matrix-synapse (0.13.2-1) trusty; urgency=medium
+
+ * New upstream release
+
+ -- Erik Johnston <erikj@matrix.org> Thu, 11 Feb 2016 11:01:16 +0000
+
+matrix-synapse (0.13.0-1) trusty; urgency=medium
+
+ * New upstream release
+
+ -- Erik Johnston <erikj@matrix.org> Wed, 10 Feb 2016 16:34:39 +0000
+
+matrix-synapse (0.12.0-2) trusty; urgency=medium
+
+ * Don't default `registerion_shared_secret` config option
+
+ -- Erik Johnston <erikj@matrix.org> Wed, 06 Jan 2016 16:34:02 +0000
+
+matrix-synapse (0.12.0-1) stable; urgency=medium
+
+ * Imported Upstream version 0.12.0
+
+ -- Mark Haines <mark@matrix.org> Mon, 04 Jan 2016 15:38:33 +0000
+
+matrix-synapse (0.11.1-1) unstable; urgency=medium
+
+ * Imported Upstream version 0.11.1
+
+ -- Erik Johnston <erikj@matrix.org> Fri, 20 Nov 2015 17:56:52 +0000
+
+matrix-synapse (0.11.0-r2-1) stable; urgency=medium
+
+ * Imported Upstream version 0.11.0-r2
+ * Add gbp.conf
+
+ -- Erik Johnston <erikj@matrix.org> Thu, 19 Nov 2015 13:52:36 +0000
+
+matrix-synapse (0.11.0-1) wheezy; urgency=medium
+
+ * Fix dependencies.
+
+ -- Erik Johnston <erikj@matrix.org> Tue, 17 Nov 2015 16:28:06 +0000
+
+matrix-synapse (0.11.0-0) wheezy; urgency=medium
+
+ * New upstream release
+
+ -- Erik Johnston <erikj@matrix.org> Tue, 17 Nov 2015 16:03:01 +0000
+
+matrix-synapse (0.10.0-2) wheezy; urgency=medium
+
+ * Rebuild for wheezy.
+
+ -- Erik Johnston <erikj@matrix.org> Fri, 04 Sep 2015 14:21:03 +0100
+
+matrix-synapse (0.10.0-1) trusty; urgency=medium
+
+ * New upstream release
+
+ -- Erik Johnston <erikj@matrix.org> Thu, 03 Sep 2015 10:08:34 +0100
+
+matrix-synapse (0.10.0~rc6-3) trusty; urgency=medium
+
+ * Create log directory.
+
+ -- Erik Johnston <erikj@matrix.org> Wed, 02 Sep 2015 17:49:07 +0100
+
+matrix-synapse (0.10.0~rc6-2) trusty; urgency=medium
+
+ * Add patch to work around upstream bug in config directory handling.
+
+ -- Erik Johnston <erikj@matrix.org> Wed, 02 Sep 2015 17:42:42 +0100
+
+matrix-synapse (0.10.0~rc6-1) trusty; urgency=medium
+
+ * New upstream release
+
+ -- Erik Johnston <erikj@matrix.org> Wed, 02 Sep 2015 17:21:21 +0100
+
+matrix-synapse (0.10.0~rc5-3) trusty; urgency=medium
+
+ * Update init script to work.
+
+ -- Erik Johnston <erikj@matrix.org> Fri, 28 Aug 2015 10:51:56 +0100
+
+matrix-synapse (0.10.0~rc5-2) trusty; urgency=medium
+
+ * Fix where python files are installed.
+
+ -- Erik Johnston <erikj@matrix.org> Thu, 27 Aug 2015 11:55:39 +0100
+
+matrix-synapse (0.10.0~rc5-1) trusty; urgency=medium
+
+ * New upstream release
+
+ -- Erik Johnston <erikj@matrix.org> Thu, 27 Aug 2015 11:26:54 +0100
+
+matrix-synapse (0.10.0~rc4-1) trusty; urgency=medium
+
+ * New upstream version.
+
+ -- Erik Johnston <erikj@matrix.org> Thu, 27 Aug 2015 10:29:31 +0100
+
+matrix-synapse (0.10.0~rc3-7) trusty; urgency=medium
+
+ * Add debian/watch
+
+ -- Erik Johnston <erikj@matrix.org> Wed, 26 Aug 2015 17:57:08 +0100
+
+matrix-synapse (0.10.0~rc3-6) trusty; urgency=medium
+
+ * Deps.
+
+ -- Erik Johnston <erikj@matrix.org> Wed, 26 Aug 2015 17:07:13 +0100
+
+matrix-synapse (0.10.0~rc3-5) trusty; urgency=medium
+
+ * Deps.
+
+ -- Erik Johnston <erikj@matrix.org> Wed, 26 Aug 2015 16:18:02 +0100
+
+matrix-synapse (0.10.0~rc3-4) trusty; urgency=medium
+
+ * More deps.
+
+ -- Erik Johnston <erikj@matrix.org> Wed, 26 Aug 2015 14:09:27 +0100
+
+matrix-synapse (0.10.0~rc3-3) trusty; urgency=medium
+
+ * Update deps.
+
+ -- Erik Johnston <erikj@matrix.org> Wed, 26 Aug 2015 13:49:20 +0100
+
+matrix-synapse (0.10.0~rc3-2) trusty; urgency=medium
+
+ * Add more deps.
+
+ -- Erik Johnston <erikj@matrix.org> Wed, 26 Aug 2015 13:25:45 +0100
+
+matrix-synapse (0.10.0~rc3-1) trusty; urgency=medium
+
+ * New upstream release
+
+ -- Erik Johnston <erikj@matrix.org> Tue, 25 Aug 2015 17:52:33 +0100
+
+matrix-synapse (0.9.3-1~trusty1) trusty; urgency=medium
+
+ * Rebuild for trusty.
+
+ -- Erik Johnston <erikj@matrix.org> Thu, 20 Aug 2015 15:05:43 +0100
+
+matrix-synapse (0.9.3-1) wheezy; urgency=medium
+
+ * New upstream release
+ * Create a user, "matrix-synapse", to run as
+ * Log to /var/log/matrix-synapse/ directory
+ * Override the way synapse looks for the angular SDK (syweb) so it finds the
+ packaged one
+
+ -- Paul "LeoNerd" Evans <paul@matrix.org> Fri, 07 Aug 2015 15:32:12 +0100
+
+matrix-synapse (0.9.2-2) wheezy; urgency=medium
+
+ * Supply a default config file
+ * Create directory in /var/lib
+ * Use debconf to ask the user for the server name at installation time
+
+ -- Paul "LeoNerd" Evans <paul@matrix.org> Thu, 06 Aug 2015 15:28:00 +0100
+
+matrix-synapse (0.9.2-1) wheezy; urgency=low
+
+ * source package automatically created by stdeb 0.8.2
+
+ -- Paul "LeoNerd" Evans <paul@matrix.org> Fri, 12 Jun 2015 14:32:03 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000000..ec635144f6
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/config b/debian/config
new file mode 100755
index 0000000000..9fb6913298
--- /dev/null
+++ b/debian/config
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+db_input high matrix-synapse/server-name || true
+db_input high matrix-synapse/report-stats || true
+db_go
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000000..854d9688f3
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,77 @@
+Source: matrix-synapse
+Maintainer: Erik Johnston <erikj@matrix.org>
+Section: python
+Priority: optional
+Build-Depends:
+ debhelper (>= 9),
+ dh-python,
+ dh-systemd (>= 1.5),
+ po-debconf,
+ python (>= 2.6.6-3),
+ python-bcrypt,
+ python-blist,
+ python-canonicaljson (>=1.1.3),
+ python-daemonize,
+ python-frozendict (>= 0.4),
+ python-lxml,
+ python-mock,
+ python-msgpack (>=0.3.0),
+ python-nacl (>= 0.3.0),
+ python-netaddr,
+ python-openssl (>= 0.14),
+ python-pil,
+ python-psutil,
+ python-pyasn1,
+ python-pydenticon,
+ python-pymacaroons-pynacl,
+ python-pysaml2,
+ python-service-identity (>= 1.0.0),
+ python-setuptools (>= 0.6b3),
+ python-signedjson (>= 1.0.0),
+ python-sortedcontainers,
+ python-syutil (>= 0.0.7),
+ python-treq (>= 15.1.0),
+ python-twisted (>= 17.1.0),
+ python-unpaddedbase64 (>= 1.0.1),
+ python-yaml,
+ python-phonenumbers (>= 8.2.0),
+ python-jsonschema (>=2.5.1),
+ python-prometheus-client,
+ python-attr
+Standards-Version: 3.9.8
+X-Python-Version: >= 2.7
+
+Package: matrix-synapse
+Architecture: all
+Depends:
+ ${misc:Depends},
+ ${python:Depends},
+ adduser,
+ debconf,
+ lsb-base (>= 3.0-6),
+ python-attr (>= 16.0.0),
+ python-twisted (>= 17.1.0),
+ python-canonicaljson (>=1.1.3),
+ python-prometheus-client (>=0.0.14),
+Suggests:
+ python-bleach (>= 1.4.2),
+ python-jinja2 (>= 2.8),
+Recommends:
+ python-psycopg2,
+ python-lxml,
+Description: Open federated Instant Messaging and VoIP server
+ Matrix is an ambitious new ecosystem for open federated Instant
+ Messaging and VoIP. Synapse is a reference Matrix server
+ implementation.
+ .
+ Everything in Matrix happens in a room. Rooms are distributed and do
+ not exist on any single server. Rooms can be located using
+ convenience aliases like #matrix:matrix.org or #test:localhost:8448.
+ .
+ Matrix user IDs look like @matthew:matrix.org (although in the future
+ you will normally refer to yourself and others using a 3PID: email
+ address, phone number, etc rather than manipulating Matrix user IDs)
+ .
+ The overall architecture is:
+ client <------> homeserver <=============> homeserver <------> client
+ https://a.org/_matrix https://b.net/_matrix
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000000..35597e0804
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,118 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: synapse
+Source: https://github.com/matrix-org/synapse
+
+Files: *
+Copyright: 2014-2017, OpenMarket Ltd
+License: Apache-2.0
+
+Files: synapse/config/saml2.py
+Copyright: 2015, Ericsson
+License: Apache-2.0
+
+Files: synapse/config/jwt.py
+Copyright: 2015, Niklas Riekenbrauck
+License: Apache-2.0
+
+Files: synapse/config/workers.py
+Copyright: 2016, matrix.org
+License: Apache-2.0
+
+Files: synapse/config/repository.py
+Copyright: 2014-2015, matrix.org
+License: Apache-2.0
+
+Files: contrib/jitsimeetbridge/unjingle/strophe/base64.js
+Copyright: Public Domain (Tyler Akins http://rumkin.com)
+License: public-domain
+ This code was written by Tyler Akins and has been placed in the
+ public domain. It would be nice if you left this header intact.
+ Base64 code from Tyler Akins -- http://rumkin.com
+
+Files: contrib/jitsimeetbridge/unjingle/strophe/md5.js
+Copyright: 1999-2002, Paul Johnston & Contributors
+License: BSD-3-clause
+
+Files: contrib/jitsimeetbridge/unjingle/strophe/strophe.js
+Copyright: 2006-2008, OGG, LLC
+License: Expat
+
+Files: contrib/jitsimeetbridge/unjingle/strophe/XMLHttpRequest.js
+Copyright: 2010 passive.ly LLC
+License: Expat
+
+Files: contrib/jitsimeetbridge/unjingle/*.js
+Copyright: 2014 Jitsi
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2016-2017, Erik Johnston <erik@matrix.org>
+ 2017, Rahul De <rahulde@swecha.net>
+ 2017, Sunil Mohan Adapa <sunil@medhas.org>
+License: Apache-2.0
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the full text of the Apache License version
+ 2.0 can be found in the file
+ `/usr/share/common-licenses/Apache-2.0'.
+
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following
+ disclaimer. Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with
+ the distribution.
+ .
+ Neither the name of the author nor the names of its contributors may
+ be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000000..9d2a980c92
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,3 @@
+etc/matrix-synapse
+var/lib/matrix-synapse
+var/log/matrix-synapse
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000000..0432accfa0
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,5 @@
+[DEFAULT]
+debian-branch = debian
+
+[dch]
+distribution = stable
diff --git a/debian/hash_password.1 b/debian/hash_password.1
new file mode 100644
index 0000000000..383f452991
--- /dev/null
+++ b/debian/hash_password.1
@@ -0,0 +1,90 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "HASH_PASSWORD" "1" "February 2017" "" ""
+.
+.SH "NAME"
+\fBhash_password\fR \- Calculate the hash of a new password, so that passwords can be reset
+.
+.SH "SYNOPSIS"
+\fBhash_password\fR [\fB\-p\fR|\fB\-\-password\fR [password]] [\fB\-c\fR|\fB\-\-config\fR \fIfile\fR]
+.
+.SH "DESCRIPTION"
+\fBhash_password\fR calculates the hash of a supplied password using bcrypt\.
+.
+.P
+\fBhash_password\fR takes a password as an parameter either on the command line or the \fBSTDIN\fR if not supplied\.
+.
+.P
+It accepts an YAML file which can be used to specify parameters like the number of rounds for bcrypt and password_config section having the pepper value used for the hashing\. By default \fBbcrypt_rounds\fR is set to \fB10\fR\.
+.
+.P
+The hashed password is written on the \fBSTDOUT\fR\.
+.
+.SH "FILES"
+A sample YAML file accepted by \fBhash_password\fR is described below:
+.
+.P
+bcrypt_rounds: 17 password_config: pepper: "random hashing pepper"
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-p\fR, \fB\-\-password\fR
+Read the password form the command line if [password] is supplied\. If not, prompt the user and read the password form the \fBSTDIN\fR\. It is not recommended to type the password on the command line directly\. Use the STDIN instead\.
+.
+.TP
+\fB\-c\fR, \fB\-\-config\fR
+Read the supplied YAML \fIfile\fR containing the options \fBbcrypt_rounds\fR and the \fBpassword_config\fR section containing the \fBpepper\fR value\.
+.
+.SH "EXAMPLES"
+Hash from the command line:
+.
+.IP "" 4
+.
+.nf
+
+$ hash_password \-p "p@ssw0rd"
+$2b$12$VJNqWQYfsWTEwcELfoSi4Oa8eA17movHqqi8\.X8fWFpum7SxZ9MFe
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Hash from the STDIN:
+.
+.IP "" 4
+.
+.nf
+
+$ hash_password
+Password:
+Confirm password:
+$2b$12$AszlvfmJl2esnyhmn8m/kuR2tdXgROWtWxnX\.rcuAbM8ErLoUhybG
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Using a config file:
+.
+.IP "" 4
+.
+.nf
+
+$ hash_password \-c config\.yml
+Password:
+Confirm password:
+$2b$12$CwI\.wBNr\.w3kmiUlV3T5s\.GT2wH7uebDCovDrCOh18dFedlANK99O
+.
+.fi
+.
+.IP "" 0
+.
+.SH "COPYRIGHT"
+This man page was written by Rahul De <\fIrahulde@swecha\.net\fR> for Debian GNU/Linux distribution\.
+.
+.SH "SEE ALSO"
+synctl(1), synapse_port_db(1), register_new_matrix_user(1)
diff --git a/debian/hash_password.ronn b/debian/hash_password.ronn
new file mode 100644
index 0000000000..0b2afa7374
--- /dev/null
+++ b/debian/hash_password.ronn
@@ -0,0 +1,69 @@
+hash_password(1) -- Calculate the hash of a new password, so that passwords can be reset
+========================================================================================
+
+## SYNOPSIS
+
+`hash_password` [`-p`|`--password` [password]] [`-c`|`--config` <file>]
+
+## DESCRIPTION
+
+**hash_password** calculates the hash of a supplied password using bcrypt.
+
+`hash_password` takes a password as an parameter either on the command line
+or the `STDIN` if not supplied.
+
+It accepts an YAML file which can be used to specify parameters like the
+number of rounds for bcrypt and password_config section having the pepper
+value used for the hashing. By default `bcrypt_rounds` is set to **10**.
+
+The hashed password is written on the `STDOUT`.
+
+## FILES
+
+A sample YAML file accepted by `hash_password` is described below:
+
+ bcrypt_rounds: 17
+ password_config:
+ pepper: "random hashing pepper"
+
+## OPTIONS
+
+ * `-p`, `--password`:
+ Read the password form the command line if [password] is supplied.
+ If not, prompt the user and read the password form the `STDIN`.
+ It is not recommended to type the password on the command line
+ directly. Use the STDIN instead.
+
+ * `-c`, `--config`:
+ Read the supplied YAML <file> containing the options `bcrypt_rounds`
+ and the `password_config` section containing the `pepper` value.
+
+## EXAMPLES
+
+Hash from the command line:
+
+ $ hash_password -p "p@ssw0rd"
+ $2b$12$VJNqWQYfsWTEwcELfoSi4Oa8eA17movHqqi8.X8fWFpum7SxZ9MFe
+
+Hash from the STDIN:
+
+ $ hash_password
+ Password:
+ Confirm password:
+ $2b$12$AszlvfmJl2esnyhmn8m/kuR2tdXgROWtWxnX.rcuAbM8ErLoUhybG
+
+Using a config file:
+
+ $ hash_password -c config.yml
+ Password:
+ Confirm password:
+ $2b$12$CwI.wBNr.w3kmiUlV3T5s.GT2wH7uebDCovDrCOh18dFedlANK99O
+
+## COPYRIGHT
+
+This man page was written by Rahul De <<rahulde@swecha.net>>
+for Debian GNU/Linux distribution.
+
+## SEE ALSO
+
+synctl(1), synapse_port_db(1), register_new_matrix_user(1)
diff --git a/debian/homeserver.yaml b/debian/homeserver.yaml
new file mode 100644
index 0000000000..04ece25d49
--- /dev/null
+++ b/debian/homeserver.yaml
@@ -0,0 +1,621 @@
+# vim:ft=yaml
+# PEM encoded X509 certificate for TLS.
+# You can replace the self-signed certificate that synapse
+# autogenerates on launch with your own SSL certificate + key pair
+# if you like. Any required intermediary certificates can be
+# appended after the primary certificate in hierarchical order.
+tls_certificate_path: "/etc/matrix-synapse/homeserver.tls.crt"
+
+# PEM encoded private key for TLS
+tls_private_key_path: "/etc/matrix-synapse/homeserver.tls.key"
+
+# PEM dh parameters for ephemeral keys
+tls_dh_params_path: "/etc/matrix-synapse/homeserver.tls.dh"
+
+# Don't bind to the https port
+no_tls: False
+
+# List of allowed TLS fingerprints for this server to publish along
+# with the signing keys for this server. Other matrix servers that
+# make HTTPS requests to this server will check that the TLS
+# certificates returned by this server match one of the fingerprints.
+#
+# Synapse automatically adds the fingerprint of its own certificate
+# to the list. So if federation traffic is handled directly by synapse
+# then no modification to the list is required.
+#
+# If synapse is run behind a load balancer that handles the TLS then it
+# will be necessary to add the fingerprints of the certificates used by
+# the loadbalancers to this list if they are different to the one
+# synapse is using.
+#
+# Homeservers are permitted to cache the list of TLS fingerprints
+# returned in the key responses up to the "valid_until_ts" returned in
+# key. It may be necessary to publish the fingerprints of a new
+# certificate and wait until the "valid_until_ts" of the previous key
+# responses have passed before deploying it.
+#
+# You can calculate a fingerprint from a given TLS listener via:
+# openssl s_client -connect $host:$port < /dev/null 2> /dev/null |
+# openssl x509 -outform DER | openssl sha256 -binary | base64 | tr -d '='
+# or by checking matrix.org/federationtester/api/report?server_name=$host
+#
+tls_fingerprints: []
+# tls_fingerprints: [{"sha256": "<base64_encoded_sha256_fingerprint>"}]
+
+
+## Server ##
+
+# When running as a daemon, the file to store the pid in
+pid_file: "/var/run/matrix-synapse.pid"
+
+# CPU affinity mask. Setting this restricts the CPUs on which the
+# process will be scheduled. It is represented as a bitmask, with the
+# lowest order bit corresponding to the first logical CPU and the
+# highest order bit corresponding to the last logical CPU. Not all CPUs
+# may exist on a given system but a mask may specify more CPUs than are
+# present.
+#
+# For example:
+# 0x00000001 is processor #0,
+# 0x00000003 is processors #0 and #1,
+# 0xFFFFFFFF is all processors (#0 through #31).
+#
+# Pinning a Python process to a single CPU is desirable, because Python
+# is inherently single-threaded due to the GIL, and can suffer a
+# 30-40% slowdown due to cache blow-out and thread context switching
+# if the scheduler happens to schedule the underlying threads across
+# different cores. See
+# https://www.mirantis.com/blog/improve-performance-python-programs-restricting-single-cpu/.
+#
+# cpu_affinity: 0xFFFFFFFF
+
+# Whether to serve a web client from the HTTP/HTTPS root resource.
+web_client: False
+
+# The root directory to server for the above web client.
+# If left undefined, synapse will serve the matrix-angular-sdk web client.
+# Make sure matrix-angular-sdk is installed with pip if web_client is True
+# and web_client_location is undefined
+# web_client_location: "/path/to/web/root"
+
+# The public-facing base URL for the client API (not including _matrix/...)
+# public_baseurl: https://example.com:8448/
+
+# Set the soft limit on the number of file descriptors synapse can use
+# Zero is used to indicate synapse should set the soft limit to the
+# hard limit.
+soft_file_limit: 0
+
+# The GC threshold parameters to pass to `gc.set_threshold`, if defined
+# gc_thresholds: [700, 10, 10]
+
+# Set the limit on the returned events in the timeline in the get
+# and sync operations. The default value is -1, means no upper limit.
+# filter_timeline_limit: 5000
+
+# Whether room invites to users on this server should be blocked
+# (except those sent by local server admins). The default is False.
+# block_non_admin_invites: True
+
+# Restrict federation to the following whitelist of domains.
+# N.B. we recommend also firewalling your federation listener to limit
+# inbound federation traffic as early as possible, rather than relying
+# purely on this application-layer restriction. If not specified, the
+# default is to whitelist everything.
+#
+# federation_domain_whitelist:
+# - lon.example.com
+# - nyc.example.com
+# - syd.example.com
+
+# List of ports that Synapse should listen on, their purpose and their
+# configuration.
+listeners:
+ # Main HTTPS listener
+ # For when matrix traffic is sent directly to synapse.
+ -
+ # The port to listen for HTTPS requests on.
+ port: 8448
+
+ # Local addresses to listen on.
+ # On Linux and Mac OS, `::` will listen on all IPv4 and IPv6
+ # addresses by default. For most other OSes, this will only listen
+ # on IPv6.
+ bind_addresses:
+ - '::'
+ - '0.0.0.0'
+
+ # This is a 'http' listener, allows us to specify 'resources'.
+ type: http
+
+ tls: true
+
+ # Use the X-Forwarded-For (XFF) header as the client IP and not the
+ # actual client IP.
+ x_forwarded: false
+
+ # List of HTTP resources to serve on this listener.
+ resources:
+ -
+ # List of resources to host on this listener.
+ names:
+ - client # The client-server APIs, both v1 and v2
+ - webclient # The bundled webclient.
+
+ # Should synapse compress HTTP responses to clients that support it?
+ # This should be disabled if running synapse behind a load balancer
+ # that can do automatic compression.
+ compress: true
+
+ - names: [federation] # Federation APIs
+ compress: false
+
+ # optional list of additional endpoints which can be loaded via
+ # dynamic modules
+ # additional_resources:
+ # "/_matrix/my/custom/endpoint":
+ # module: my_module.CustomRequestHandler
+ # config: {}
+
+ # Unsecure HTTP listener,
+ # For when matrix traffic passes through loadbalancer that unwraps TLS.
+ - port: 8008
+ tls: false
+ bind_addresses: ['::', '0.0.0.0']
+ type: http
+
+ x_forwarded: false
+
+ resources:
+ - names: [client, webclient]
+ compress: true
+ - names: [federation]
+ compress: false
+
+ # Turn on the twisted ssh manhole service on localhost on the given
+ # port.
+ # - port: 9000
+ # bind_addresses: ['::1', '127.0.0.1']
+ # type: manhole
+
+
+# Database configuration
+database:
+ # The database engine name
+ name: "sqlite3"
+ # Arguments to pass to the engine
+ args:
+ # Path to the database
+ database: "/var/lib/matrix-synapse/homeserver.db"
+
+# Number of events to cache in memory.
+event_cache_size: "10K"
+
+
+# A yaml python logging config file
+log_config: "/etc/matrix-synapse/log.yaml"
+
+
+
+## Ratelimiting ##
+
+# Number of messages a client can send per second
+rc_messages_per_second: 0.2
+
+# Number of message a client can send before being throttled
+rc_message_burst_count: 10.0
+
+# The federation window size in milliseconds
+federation_rc_window_size: 1000
+
+# The number of federation requests from a single server in a window
+# before the server will delay processing the request.
+federation_rc_sleep_limit: 10
+
+# The duration in milliseconds to delay processing events from
+# remote servers by if they go over the sleep limit.
+federation_rc_sleep_delay: 500
+
+# The maximum number of concurrent federation requests allowed
+# from a single server
+federation_rc_reject_limit: 50
+
+# The number of federation requests to concurrently process from a
+# single server
+federation_rc_concurrent: 3
+
+
+
+# Directory where uploaded images and attachments are stored.
+media_store_path: "/var/lib/matrix-synapse/media"
+
+# Media storage providers allow media to be stored in different
+# locations.
+# media_storage_providers:
+# - module: file_system
+# # Whether to write new local files.
+# store_local: false
+# # Whether to write new remote media
+# store_remote: false
+# # Whether to block upload requests waiting for write to this
+# # provider to complete
+# store_synchronous: false
+# config:
+# directory: /mnt/some/other/directory
+
+# Directory where in-progress uploads are stored.
+uploads_path: "/var/lib/matrix-synapse/uploads"
+
+# The largest allowed upload size in bytes
+max_upload_size: "10M"
+
+# Maximum number of pixels that will be thumbnailed
+max_image_pixels: "32M"
+
+# Whether to generate new thumbnails on the fly to precisely match
+# the resolution requested by the client. If true then whenever
+# a new resolution is requested by the client the server will
+# generate a new thumbnail. If false the server will pick a thumbnail
+# from a precalculated list.
+dynamic_thumbnails: false
+
+# List of thumbnail to precalculate when an image is uploaded.
+thumbnail_sizes:
+- width: 32
+ height: 32
+ method: crop
+- width: 96
+ height: 96
+ method: crop
+- width: 320
+ height: 240
+ method: scale
+- width: 640
+ height: 480
+ method: scale
+- width: 800
+ height: 600
+ method: scale
+
+# Is the preview URL API enabled? If enabled, you *must* specify
+# an explicit url_preview_ip_range_blacklist of IPs that the spider is
+# denied from accessing.
+url_preview_enabled: False
+
+# List of IP address CIDR ranges that the URL preview spider is denied
+# from accessing. There are no defaults: you must explicitly
+# specify a list for URL previewing to work. You should specify any
+# internal services in your network that you do not want synapse to try
+# to connect to, otherwise anyone in any Matrix room could cause your
+# synapse to issue arbitrary GET requests to your internal services,
+# causing serious security issues.
+#
+# url_preview_ip_range_blacklist:
+# - '127.0.0.0/8'
+# - '10.0.0.0/8'
+# - '172.16.0.0/12'
+# - '192.168.0.0/16'
+# - '100.64.0.0/10'
+# - '169.254.0.0/16'
+#
+# List of IP address CIDR ranges that the URL preview spider is allowed
+# to access even if they are specified in url_preview_ip_range_blacklist.
+# This is useful for specifying exceptions to wide-ranging blacklisted
+# target IP ranges - e.g. for enabling URL previews for a specific private
+# website only visible in your network.
+#
+# url_preview_ip_range_whitelist:
+# - '192.168.1.1'
+
+# Optional list of URL matches that the URL preview spider is
+# denied from accessing. You should use url_preview_ip_range_blacklist
+# in preference to this, otherwise someone could define a public DNS
+# entry that points to a private IP address and circumvent the blacklist.
+# This is more useful if you know there is an entire shape of URL that
+# you know that will never want synapse to try to spider.
+#
+# Each list entry is a dictionary of url component attributes as returned
+# by urlparse.urlsplit as applied to the absolute form of the URL. See
+# https://docs.python.org/2/library/urlparse.html#urlparse.urlsplit
+# The values of the dictionary are treated as an filename match pattern
+# applied to that component of URLs, unless they start with a ^ in which
+# case they are treated as a regular expression match. If all the
+# specified component matches for a given list item succeed, the URL is
+# blacklisted.
+#
+# url_preview_url_blacklist:
+# # blacklist any URL with a username in its URI
+# - username: '*'
+#
+# # blacklist all *.google.com URLs
+# - netloc: 'google.com'
+# - netloc: '*.google.com'
+#
+# # blacklist all plain HTTP URLs
+# - scheme: 'http'
+#
+# # blacklist http(s)://www.acme.com/foo
+# - netloc: 'www.acme.com'
+# path: '/foo'
+#
+# # blacklist any URL with a literal IPv4 address
+# - netloc: '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'
+
+# The largest allowed URL preview spidering size in bytes
+max_spider_size: "10M"
+
+
+
+
+## Captcha ##
+# See docs/CAPTCHA_SETUP for full details of configuring this.
+
+# This Home Server's ReCAPTCHA public key.
+recaptcha_public_key: "YOUR_PUBLIC_KEY"
+
+# This Home Server's ReCAPTCHA private key.
+recaptcha_private_key: "YOUR_PRIVATE_KEY"
+
+# Enables ReCaptcha checks when registering, preventing signup
+# unless a captcha is answered. Requires a valid ReCaptcha
+# public/private key.
+enable_registration_captcha: False
+
+# A secret key used to bypass the captcha test entirely.
+#captcha_bypass_secret: "YOUR_SECRET_HERE"
+
+# The API endpoint to use for verifying m.login.recaptcha responses.
+recaptcha_siteverify_api: "https://www.google.com/recaptcha/api/siteverify"
+
+
+## Turn ##
+
+# The public URIs of the TURN server to give to clients
+turn_uris: []
+
+# The shared secret used to compute passwords for the TURN server
+turn_shared_secret: "YOUR_SHARED_SECRET"
+
+# The Username and password if the TURN server needs them and
+# does not use a token
+#turn_username: "TURNSERVER_USERNAME"
+#turn_password: "TURNSERVER_PASSWORD"
+
+# How long generated TURN credentials last
+turn_user_lifetime: "1h"
+
+# Whether guests should be allowed to use the TURN server.
+# This defaults to True, otherwise VoIP will be unreliable for guests.
+# However, it does introduce a slight security risk as it allows users to
+# connect to arbitrary endpoints without having first signed up for a
+# valid account (e.g. by passing a CAPTCHA).
+turn_allow_guests: False
+
+
+## Registration ##
+
+# Enable registration for new users.
+enable_registration: False
+
+# The user must provide all of the below types of 3PID when registering.
+#
+# registrations_require_3pid:
+# - email
+# - msisdn
+
+# Mandate that users are only allowed to associate certain formats of
+# 3PIDs with accounts on this server.
+#
+# allowed_local_3pids:
+# - medium: email
+# pattern: ".*@matrix\.org"
+# - medium: email
+# pattern: ".*@vector\.im"
+# - medium: msisdn
+# pattern: "\+44"
+
+# If set, allows registration by anyone who also has the shared
+# secret, even if registration is otherwise disabled.
+# registration_shared_secret: <PRIVATE STRING>
+
+# Set the number of bcrypt rounds used to generate password hash.
+# Larger numbers increase the work factor needed to generate the hash.
+# The default number is 12 (which equates to 2^12 rounds).
+# N.B. that increasing this will exponentially increase the time required
+# to register or login - e.g. 24 => 2^24 rounds which will take >20 mins.
+bcrypt_rounds: 12
+
+# Allows users to register as guests without a password/email/etc, and
+# participate in rooms hosted on this server which have been made
+# accessible to anonymous users.
+allow_guest_access: False
+
+# The list of identity servers trusted to verify third party
+# identifiers by this server.
+trusted_third_party_id_servers:
+ - matrix.org
+ - vector.im
+ - riot.im
+
+# Users who register on this homeserver will automatically be joined
+# to these rooms
+#auto_join_rooms:
+# - "#example:example.com"
+
+
+## Metrics ###
+
+# Enable collection and rendering of performance metrics
+enable_metrics: False
+
+## API Configuration ##
+
+# A list of event types that will be included in the room_invite_state
+room_invite_state_types:
+ - "m.room.join_rules"
+ - "m.room.canonical_alias"
+ - "m.room.avatar"
+ - "m.room.name"
+
+
+# A list of application service config file to use
+app_service_config_files: []
+
+
+# macaroon_secret_key: <PRIVATE STRING>
+
+# Used to enable access token expiration.
+expire_access_token: False
+
+## Signing Keys ##
+
+# Path to the signing key to sign messages with
+signing_key_path: "/etc/matrix-synapse/homeserver.signing.key"
+
+# The keys that the server used to sign messages with but won't use
+# to sign new messages. E.g. it has lost its private key
+old_signing_keys: {}
+# "ed25519:auto":
+# # Base64 encoded public key
+# key: "The public part of your old signing key."
+# # Millisecond POSIX timestamp when the key expired.
+# expired_ts: 123456789123
+
+# How long key response published by this server is valid for.
+# Used to set the valid_until_ts in /key/v2 APIs.
+# Determines how quickly servers will query to check which keys
+# are still valid.
+key_refresh_interval: "1d" # 1 Day.
+
+# The trusted servers to download signing keys from.
+perspectives:
+ servers:
+ "matrix.org":
+ verify_keys:
+ "ed25519:auto":
+ key: "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"
+
+
+
+# Enable SAML2 for registration and login. Uses pysaml2
+# config_path: Path to the sp_conf.py configuration file
+# idp_redirect_url: Identity provider URL which will redirect
+# the user back to /login/saml2 with proper info.
+# See pysaml2 docs for format of config.
+#saml2_config:
+# enabled: true
+# config_path: "/home/erikj/git/synapse/sp_conf.py"
+# idp_redirect_url: "http://test/idp"
+
+
+
+# Enable CAS for registration and login.
+#cas_config:
+# enabled: true
+# server_url: "https://cas-server.com"
+# service_url: "https://homeserver.domain.com:8448"
+# #required_attributes:
+# # name: value
+
+
+# The JWT needs to contain a globally unique "sub" (subject) claim.
+#
+# jwt_config:
+# enabled: true
+# secret: "a secret"
+# algorithm: "HS256"
+
+
+
+# Enable password for login.
+password_config:
+ enabled: true
+ # Uncomment and change to a secret random string for extra security.
+ # DO NOT CHANGE THIS AFTER INITIAL SETUP!
+ #pepper: ""
+
+
+
+# Enable sending emails for notification events
+# Defining a custom URL for Riot is only needed if email notifications
+# should contain links to a self-hosted installation of Riot; when set
+# the "app_name" setting is ignored.
+#
+# If your SMTP server requires authentication, the optional smtp_user &
+# smtp_pass variables should be used
+#
+#email:
+# enable_notifs: false
+# smtp_host: "localhost"
+# smtp_port: 25
+# smtp_user: "exampleusername"
+# smtp_pass: "examplepassword"
+# require_transport_security: False
+# notif_from: "Your Friendly %(app)s Home Server <noreply@example.com>"
+# app_name: Matrix
+# template_dir: res/templates
+# notif_template_html: notif_mail.html
+# notif_template_text: notif_mail.txt
+# notif_for_new_users: True
+# riot_base_url: "http://localhost/riot"
+
+
+# password_providers:
+# - module: "ldap_auth_provider.LdapAuthProvider"
+# config:
+# enabled: true
+# uri: "ldap://ldap.example.com:389"
+# start_tls: true
+# base: "ou=users,dc=example,dc=com"
+# attributes:
+# uid: "cn"
+# mail: "email"
+# name: "givenName"
+# #bind_dn:
+# #bind_password:
+# #filter: "(objectClass=posixAccount)"
+
+
+
+# Clients requesting push notifications can either have the body of
+# the message sent in the notification poke along with other details
+# like the sender, or just the event ID and room ID (`event_id_only`).
+# If clients choose the former, this option controls whether the
+# notification request includes the content of the event (other details
+# like the sender are still included). For `event_id_only` push, it
+# has no effect.
+
+# For modern android devices the notification content will still appear
+# because it is loaded by the app. iPhone, however will send a
+# notification saying only that a message arrived and who it came from.
+#
+#push:
+# include_content: true
+
+
+# spam_checker:
+# module: "my_custom_project.SuperSpamChecker"
+# config:
+# example_option: 'things'
+
+
+# Whether to allow non server admins to create groups on this server
+enable_group_creation: false
+
+# If enabled, non server admins can only create groups with local parts
+# starting with this prefix
+# group_creation_prefix: "unofficial/"
+
+
+
+# User Directory configuration
+#
+# 'search_all_users' defines whether to search all users visible to your HS
+# when searching the user directory, rather than limiting to users visible
+# in public rooms. Defaults to false. If you set it True, you'll have to run
+# UPDATE user_directory_stream_pos SET stream_id = NULL;
+# on your database to tell it to rebuild the user_directory search indexes.
+#
+#user_directory:
+# search_all_users: false
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000000..d1f42c8be6
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,2 @@
+debian/homeserver.yaml etc/matrix-synapse
+debian/log.yaml etc/matrix-synapse
diff --git a/debian/log.yaml b/debian/log.yaml
new file mode 100644
index 0000000000..b44a8901f6
--- /dev/null
+++ b/debian/log.yaml
@@ -0,0 +1,35 @@
+
+version: 1
+
+formatters:
+ precise:
+ format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s- %(message)s'
+
+filters:
+ context:
+ (): synapse.util.logcontext.LoggingContextFilter
+ request: ""
+
+handlers:
+ file:
+ class: logging.handlers.RotatingFileHandler
+ formatter: precise
+ filename: /var/log/matrix-synapse/homeserver.log
+ maxBytes: 104857600
+ backupCount: 10
+ filters: [context]
+ console:
+ class: logging.StreamHandler
+ formatter: precise
+ level: WARN
+
+loggers:
+ synapse:
+ level: INFO
+
+ synapse.storage.SQL:
+ level: INFO
+
+root:
+ level: INFO
+ handlers: [file, console]
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000000..2c30583530
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1,4 @@
+debian/hash_password.1
+debian/register_new_matrix_user.1
+debian/synapse_port_db.1
+debian/synctl.1
diff --git a/debian/matrix-synapse.default b/debian/matrix-synapse.default
new file mode 100644
index 0000000000..65dc2f33d8
--- /dev/null
+++ b/debian/matrix-synapse.default
@@ -0,0 +1,2 @@
+# Specify environment variables used when running Synapse
+# SYNAPSE_CACHE_FACTOR=1 (default)
diff --git a/debian/matrix-synapse.init b/debian/matrix-synapse.init
new file mode 100755
index 0000000000..7a9e8b3296
--- /dev/null
+++ b/debian/matrix-synapse.init
@@ -0,0 +1,184 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: matrix-synapse
+# Required-Start: $local_fs $network $remote_fs $syslog
+# Required-Stop: $local_fs $network $remote_fs $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: <Enter a short description of the software>
+# Description: <Enter a long description of the software>
+# <...>
+# <...>
+### END INIT INFO
+
+# Author: Paul "LeoNerd" Evans <paul@matrix.org>
+
+# Do NOT "set -e"
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="matrix-synapse"
+NAME=matrix-synapse
+SCRIPTNAME=/etc/init.d/$NAME
+
+PYTHON="/usr/bin/python"
+CONFIGS="--config-path /etc/matrix-synapse/homeserver.yaml --config-path /etc/matrix-synapse/conf.d/"
+USER="matrix-synapse"
+SHAREDIR=/var/lib/$NAME
+
+# Exit if the package is not installed
+[ -f "/etc/matrix-synapse/homeserver.yaml" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+get_config_key()
+{
+ python -m synapse.config read "$1" $CONFIGS || return 2
+}
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+ # Running --generate-config to create keys if any are absent.
+ # Doesn't matter if not
+ $PYTHON -m "synapse.app.homeserver" $CONFIGS --generate-keys || return 2
+
+ # Return
+ # 0 if daemon has been started
+ # 1 if daemon was already running
+ # 2 if daemon could not be started
+ PIDFILE=`get_config_key "pid_file"`
+ RETVAL=$?
+ if [ "$RETVAL" != 0 ]; then
+ return $RETVAL
+ fi
+ if [ -r "$PIDFILE" ]; then
+ kill -0 `cat $PIDFILE` && return 1
+ fi
+
+ export PYTHONPATH
+
+ # Create the PID file so that synapse can write to it as nonroot
+ touch $PIDFILE
+ chown $USER:nogroup $PIDFILE
+ chown $USER:nogroup $SHAREDIR/media/
+ chown $USER:nogroup $SHAREDIR/uploads/
+
+ start-stop-daemon --start --pidfile $PIDFILE --chuid $USER \
+ --exec $PYTHON -- -m "synapse.app.homeserver" $CONFIGS --daemonize || return 2
+
+ return 0
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+ # Return
+ # 0 if daemon has been stopped
+ # 1 if daemon was already stopped
+ # 2 if daemon could not be stopped
+ # other if a failure occurred
+ PIDFILE=`get_config_key "pid_file"`
+ RETVAL=$?
+ if [ "$RETVAL" != 0 ]; then
+ return $RETVAL
+ fi
+
+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --user $USER --exec $PYTHON
+ RETVAL="$?"
+ [ "$RETVAL" = 2 ] && return 2
+
+ # Many daemons don't delete their pidfiles when they exit.
+ rm -f $PIDFILE
+ return "$RETVAL"
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+ #
+ # If the daemon can reload its configuration without
+ # restarting (for example, when it is sent a SIGHUP),
+ # then implement that here.
+ #
+ return 1
+}
+
+case "$1" in
+ start)
+ [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+ do_start
+ case "$?" in
+ 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+ 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ esac
+ ;;
+ stop)
+ [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+ 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ esac
+ ;;
+ status)
+ PIDFILE=`get_config_key "pid_file"`
+ RETVAL=$?
+ if [ "$RETVAL" != 0 ]; then
+ return $RETVAL
+ fi
+ status_of_proc -p "$PIDFILE" "$PYTHON" "$NAME" && exit 0 || exit $?
+ ;;
+ #reload|force-reload)
+ #
+ # If do_reload() is not implemented then leave this commented out
+ # and leave 'force-reload' as an alias for 'restart'.
+ #
+ #log_daemon_msg "Reloading $DESC" "$NAME"
+ #do_reload
+ #log_end_msg $?
+ #;;
+ restart|force-reload)
+ #
+ # If the "reload" option is implemented then remove the
+ # 'force-reload' alias
+ #
+ log_daemon_msg "Restarting $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1)
+ do_start
+ case "$?" in
+ 0) log_end_msg 0 ;;
+ 1) log_end_msg 1 ;; # Old process is still running
+ *) log_end_msg 1 ;; # Failed to start
+ esac
+ ;;
+ *)
+ # Failed to stop
+ log_end_msg 1
+ ;;
+ esac
+ ;;
+ *)
+ #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+ exit 3
+ ;;
+esac
+
+:
diff --git a/debian/matrix-synapse.service b/debian/matrix-synapse.service
new file mode 100644
index 0000000000..ab94e073a6
--- /dev/null
+++ b/debian/matrix-synapse.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Synapse Matrix homeserver
+
+[Service]
+Type=simple
+User=matrix-synapse
+WorkingDirectory=/var/lib/matrix-synapse
+EnvironmentFile=/etc/default/matrix-synapse
+ExecStartPre=/usr/bin/python -m synapse.app.homeserver --config-path=/etc/matrix-synapse/homeserver.yaml --config-path=/etc/matrix-synapse/conf.d/ --generate-keys
+ExecStart=/usr/bin/python -m synapse.app.homeserver --config-path=/etc/matrix-synapse/homeserver.yaml --config-path=/etc/matrix-synapse/conf.d/
+Restart=always
+RestartSec=3
+
+[Install]
+WantedBy=multi-user.target
diff --git a/debian/patches/0001-tox.patch b/debian/patches/0001-tox.patch
new file mode 100644
index 0000000000..2cf3ec0fe8
--- /dev/null
+++ b/debian/patches/0001-tox.patch
@@ -0,0 +1,19 @@
+From: Erik Johnston <erikj@matrix.org>
+Date: Fri, 10 Jun 2016 10:57:07 +0100
+Subject: tox
+
+---
+ tox.ini | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: package-synapse-debian/tox.ini
+===================================================================
+--- package-synapse-debian.orig/tox.ini
++++ package-synapse-debian/tox.ini
+@@ -1,5 +1,6 @@
+ [tox]
+ envlist = packaging, py27, py36, pep8, check_isort
++sitepackages = True
+
+ [base]
+ deps =
diff --git a/debian/patches/0002-change_instructions.patch b/debian/patches/0002-change_instructions.patch
new file mode 100644
index 0000000000..933de3ab94
--- /dev/null
+++ b/debian/patches/0002-change_instructions.patch
@@ -0,0 +1,34 @@
+From: Erik Johnston <erikj@matrix.org>
+Date: Fri, 10 Jun 2016 10:57:07 +0100
+Subject: change_instructions
+
+---
+ synapse/config/_base.py | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/synapse/config/_base.py
++++ b/synapse/config/_base.py
+@@ -31,6 +31,11 @@
+ MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\
+ Please opt in or out of reporting anonymized homeserver usage statistics, by
+ setting the `report_stats` key in your config file to either True or False.
++
++To set it run:
++
++ dpkg-reconfigure matrix-synapse
++
+ """
+
+ MISSING_REPORT_STATS_SPIEL = """\
+@@ -45,6 +50,11 @@
+
+ MISSING_SERVER_NAME = """\
+ Missing mandatory `server_name` config option.
++
++To set it run:
++
++ dpkg-reconfigure matrix-synapse
++
+ """
+
+
diff --git a/debian/patches/0004-webclient-instructions.patch b/debian/patches/0004-webclient-instructions.patch
new file mode 100644
index 0000000000..e2e61a8446
--- /dev/null
+++ b/debian/patches/0004-webclient-instructions.patch
@@ -0,0 +1,27 @@
+From: Erik Johnston <erikj@matrix.org>
+Date: Fri, 10 Jun 2016 10:57:07 +0100
+Subject: webclient-instructions
+
+---
+ synapse/app/homeserver.py | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+Index: package-synapse-debian/synapse/app/homeserver.py
+===================================================================
+--- package-synapse-debian.orig/synapse/app/homeserver.py
++++ package-synapse-debian/synapse/app/homeserver.py
+@@ -86,12 +86,11 @@ def build_resource_for_web_client(hs):
+ "Please either install the matrix-angular-sdk or configure\n"
+ "the location of the source to serve via the configuration\n"
+ "option `web_client_location`\n\n"
+- "To install the `matrix-angular-sdk` via pip, run:\n\n"
+- " pip install '%(dep)s'\n"
++ "To install the `matrix-angular-sdk` via apt-get, run:\n\n"
++ " apt-get install matrix-synapse-angular-client\n"
+ "\n"
+ "You can also disable hosting of the webclient via the\n"
+ "configuration option `web_client`\n"
+- % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]}
+ )
+ syweb_path = os.path.dirname(syweb.__file__)
+ webclient_path = os.path.join(syweb_path, "webclient")
diff --git a/debian/patches/0006-Don-t-require-strict-nacl-0.3.0-requirement.patch b/debian/patches/0006-Don-t-require-strict-nacl-0.3.0-requirement.patch
new file mode 100644
index 0000000000..8370c96166
--- /dev/null
+++ b/debian/patches/0006-Don-t-require-strict-nacl-0.3.0-requirement.patch
@@ -0,0 +1,21 @@
+From: Erik Johnston <erikj@matrix.org>
+Date: Mon, 20 Jun 2016 13:20:37 +0100
+Subject: Don't require strict nacl==0.3.0 requirement
+
+---
+ synapse/python_dependencies.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: package-synapse-debian/synapse/python_dependencies.py
+===================================================================
+--- package-synapse-debian.orig/synapse/python_dependencies.py
++++ package-synapse-debian/synapse/python_dependencies.py
+@@ -37,7 +37,7 @@ REQUIREMENTS = {
+ "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"],
+ "canonicaljson>=1.1.3": ["canonicaljson>=1.1.3"],
+ "signedjson>=1.0.0": ["signedjson>=1.0.0"],
+- "pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"],
++ "pynacl>=0.3.0": ["nacl>=0.3.0", "nacl.bindings"],
+ "service_identity>=16.0.0": ["service_identity>=16.0.0"],
+ "Twisted>=17.1.0": ["twisted>=17.1.0"],
+ "treq>=15.1": ["treq>=15.1"],
diff --git a/debian/patches/bcrypt.patch b/debian/patches/bcrypt.patch
new file mode 100644
index 0000000000..a962949920
--- /dev/null
+++ b/debian/patches/bcrypt.patch
@@ -0,0 +1,30 @@
+Index: package-synapse-debian/synapse/handlers/auth.py
+===================================================================
+--- package-synapse-debian.orig/synapse/handlers/auth.py
++++ package-synapse-debian/synapse/handlers/auth.py
+@@ -921,10 +921,10 @@ class AuthHandler(BaseHandler):
+ # Normalise the Unicode in the password
+ pw = unicodedata.normalize("NFKC", password)
+
+- return bcrypt.checkpw(
++ return bcrypt.hashpw(
+ pw.encode('utf8') + self.hs.config.password_pepper.encode("utf8"),
+ stored_hash
+- )
++ ) == stored_hash
+
+ if stored_hash:
+ if not isinstance(stored_hash, bytes):
+Index: package-synapse-debian/synapse/python_dependencies.py
+===================================================================
+--- package-synapse-debian.orig/synapse/python_dependencies.py
++++ package-synapse-debian/synapse/python_dependencies.py
+@@ -49,7 +49,7 @@ REQUIREMENTS = {
+ "pyasn1>=0.1.9": ["pyasn1"],
+ "pyasn1-modules>=0.0.7": ["pyasn1_modules"],
+ "daemonize>=2.3.1": ["daemonize"],
+- "bcrypt>=3.1.0": ["bcrypt>=3.1.0"],
++ "bcrypt": ["bcrypt"],
+ "pillow>=3.1.2": ["PIL"],
+ "sortedcontainers>=1.4.4": ["sortedcontainers"],
+ "psutil>=2.0.0": ["psutil>=2.0.0"],
diff --git a/debian/patches/no_install_with_pip b/debian/patches/no_install_with_pip
new file mode 100644
index 0000000000..654656f596
--- /dev/null
+++ b/debian/patches/no_install_with_pip
@@ -0,0 +1,43 @@
+Index: package-synapse-debian/synapse/app/__init__.py
+===================================================================
+--- package-synapse-debian.orig/synapse/app/__init__.py
++++ package-synapse-debian/synapse/app/__init__.py
+@@ -25,8 +25,8 @@ try:
+ except python_dependencies.MissingRequirementError as e:
+ message = "\n".join([
+ "Missing Requirement: %s" % (str(e),),
+- "To install run:",
+- " pip install --upgrade --force \"%s\"" % (e.dependency,),
++ "To install, try:",
++ " sudo apt-get install python-%s" % (e.dependency,),
+ "",
+ ])
+ sys.stderr.writelines(message)
+Index: package-synapse-debian/synapse/config/jwt_config.py
+===================================================================
+--- package-synapse-debian.orig/synapse/config/jwt_config.py
++++ package-synapse-debian/synapse/config/jwt_config.py
+@@ -19,7 +19,7 @@ MISSING_JWT = (
+ """Missing jwt library. This is required for jwt login.
+
+ Install by running:
+- pip install pyjwt
++ sudo apt-get install python-jwt
+ """
+ )
+
+Index: package-synapse-debian/synapse/config/repository.py
+===================================================================
+--- package-synapse-debian.orig/synapse/config/repository.py
++++ package-synapse-debian/synapse/config/repository.py
+@@ -27,9 +27,7 @@ MISSING_LXML = (
+ """Missing lxml library. This is required for URL preview API.
+
+ Install by running:
+- pip install lxml
+-
+- Requires libxslt1-dev system package.
++ sudo apt-get install python-lxml
+ """
+ )
+
diff --git a/debian/patches/remove-webclient.patch b/debian/patches/remove-webclient.patch
new file mode 100644
index 0000000000..bfd2fce576
--- /dev/null
+++ b/debian/patches/remove-webclient.patch
@@ -0,0 +1,31 @@
+Index: package-synapse-debian/synapse/app/homeserver.py
+===================================================================
+--- package-synapse-debian.orig/synapse/app/homeserver.py
++++ package-synapse-debian/synapse/app/homeserver.py
+@@ -124,7 +124,7 @@ class SynapseHomeServer(HomeServer):
+ for res in listener_config["resources"]:
+ for name in res["names"]:
+ resources.update(self._configure_named_resource(
+- name, res.get("compress", False),
++ config, name, res.get("compress", False),
+ ))
+
+ additional_resources = listener_config.get("additional_resources", {})
+@@ -171,7 +171,7 @@ class SynapseHomeServer(HomeServer):
+ )
+ logger.info("Synapse now listening on port %d", port)
+
+- def _configure_named_resource(self, name, compress=False):
++ def _configure_named_resource(self, config, name, compress=False):
+ """Build a resource map for a named resource
+
+ Args:
+@@ -235,7 +235,7 @@ class SynapseHomeServer(HomeServer):
+ if name in ["keys", "federation"]:
+ resources[SERVER_KEY_V2_PREFIX] = KeyApiV2Resource(self)
+
+- if name == "webclient":
++ if name == "webclient" and config.web_client:
+ resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self)
+
+ if name == "metrics" and self.get_config().enable_metrics:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000000..ae46209e92
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+0001-tox.patch
+0002-change_instructions.patch
+0004-webclient-instructions.patch
+0006-Don-t-require-strict-nacl-0.3.0-requirement.patch
+remove-webclient.patch
+bcrypt.patch
+no_install_with_pip
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
new file mode 100644
index 0000000000..cef83a3407
--- /dev/null
+++ b/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] templates
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
new file mode 100644
index 0000000000..84d960761a
--- /dev/null
+++ b/debian/po/templates.pot
@@ -0,0 +1,56 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the matrix-synapse package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: matrix-synapse\n"
+"Report-Msgid-Bugs-To: matrix-synapse@packages.debian.org\n"
+"POT-Creation-Date: 2017-02-21 07:51+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid "Name of the server:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"The name that this homeserver will appear as, to clients and other servers "
+"via federation. This name should match the SRV record published in DNS."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Report anonymous statistics?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Developers of Matrix and Synapse really appreciate helping the project out "
+"by reporting anonymized usage statistics from this homeserver. Only very "
+"basic aggregate data (e.g. number of users) will be reported, but it helps "
+"track the growth of the Matrix community, and helps in making Matrix a "
+"success, as well as to convince other networks that they should peer with "
+"Matrix."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Thank you."
+msgstr ""
diff --git a/debian/postinst b/debian/postinst
new file mode 100755
index 0000000000..0509acd0a4
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,39 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+CONFIGFILE_SERVERNAME="/etc/matrix-synapse/conf.d/server_name.yaml"
+CONFIGFILE_REPORTSTATS="/etc/matrix-synapse/conf.d/report_stats.yaml"
+USER="matrix-synapse"
+
+case "$1" in
+ configure|reconfigure)
+ # Set server name in config file
+ mkdir -p "/etc/matrix-synapse/conf.d/"
+ db_get matrix-synapse/server-name
+
+ if [ "$RET" ]; then
+ echo "server_name: $RET" > $CONFIGFILE_SERVERNAME
+ fi
+
+ db_get matrix-synapse/report-stats
+ if [ "$RET" ]; then
+ echo "report_stats: $RET" > $CONFIGFILE_REPORTSTATS
+ fi
+
+ if ! getent passwd $USER >/dev/null; then
+ adduser --quiet --system --no-create-home --home /var/lib/matrix-synapse $USER
+ fi
+
+ for DIR in /var/lib/matrix-synapse /var/log/matrix-synapse /etc/matrix-synapse; do
+ if ! dpkg-statoverride --list --quiet $DIR >/dev/null; then
+ dpkg-statoverride --force --quiet --update --add $USER nogroup 0755 $DIR
+ fi
+ done
+
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
new file mode 100644
index 0000000000..e2e34b7d30
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1,5 @@
+matrix-angular-sdk
+jinja2
+bleach
+ldap3
+matrix-synapse-ldap3
diff --git a/debian/register_new_matrix_user.1 b/debian/register_new_matrix_user.1
new file mode 100644
index 0000000000..99156a7354
--- /dev/null
+++ b/debian/register_new_matrix_user.1
@@ -0,0 +1,72 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "REGISTER_NEW_MATRIX_USER" "1" "February 2017" "" ""
+.
+.SH "NAME"
+\fBregister_new_matrix_user\fR \- Used to register new users with a given home server when registration has been disabled
+.
+.SH "SYNOPSIS"
+\fBregister_new_matrix_user\fR options\.\.\.
+.
+.SH "DESCRIPTION"
+\fBregister_new_matrix_user\fR registers new users with a given home server when registration has been disabled\. For this to work, the home server must be configured with the \'registration_shared_secret\' option set\.
+.
+.P
+This accepts the user credentials like the username, password, is user an admin or not and registers the user onto the homeserver database\. Also, a YAML file containing the shared secret can be provided\. If not, the shared secret can be provided via the command line\.
+.
+.P
+By default it assumes the home server URL to be \fBhttps://localhost:8448\fR\. This can be changed via the \fBserver_url\fR command line option\.
+.
+.SH "FILES"
+A sample YAML file accepted by \fBregister_new_matrix_user\fR is described below:
+.
+.IP "" 4
+.
+.nf
+
+registration_shared_secret: "s3cr3t"
+.
+.fi
+.
+.IP "" 0
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-u\fR, \fB\-\-user\fR
+Local part of the new user\. Will prompt if omitted\.
+.
+.TP
+\fB\-p\fR, \fB\-\-password\fR
+New password for user\. Will prompt if omitted\. Supplying the password on the command line is not recommended\. Use the STDIN instead\.
+.
+.TP
+\fB\-a\fR, \fB\-\-admin\fR
+Register new user as an admin\. Will prompt if omitted\.
+.
+.TP
+\fB\-c\fR, \fB\-\-config\fR
+Path to server config file containing the shared secret\.
+.
+.TP
+\fB\-k\fR, \fB\-\-shared\-secret\fR
+Shared secret as defined in server config file\. This is an optional parameter as it can be also supplied via the YAML file\.
+.
+.TP
+\fBserver_url\fR
+URL of the home server\. Defaults to \'https://localhost:8448\'\.
+.
+.SH "EXAMPLES"
+.
+.nf
+
+$ register_new_matrix_user \-u user1 \-p p@ssword \-a \-c config\.yaml
+.
+.fi
+.
+.SH "COPYRIGHT"
+This man page was written by Rahul De <\fIrahulde@swecha\.net\fR> for Debian GNU/Linux distribution\.
+.
+.SH "SEE ALSO"
+synctl(1), synapse_port_db(1), hash_password(1)
diff --git a/debian/register_new_matrix_user.ronn b/debian/register_new_matrix_user.ronn
new file mode 100644
index 0000000000..4c22e74dde
--- /dev/null
+++ b/debian/register_new_matrix_user.ronn
@@ -0,0 +1,61 @@
+register_new_matrix_user(1) -- Used to register new users with a given home server when registration has been disabled
+======================================================================================================================
+
+## SYNOPSIS
+
+`register_new_matrix_user` options...
+
+## DESCRIPTION
+
+**register_new_matrix_user** registers new users with a given home server when
+registration has been disabled. For this to work, the home server must be
+configured with the 'registration_shared_secret' option set.
+
+This accepts the user credentials like the username, password, is user an
+admin or not and registers the user onto the homeserver database. Also,
+a YAML file containing the shared secret can be provided. If not, the
+shared secret can be provided via the command line.
+
+By default it assumes the home server URL to be `https://localhost:8448`.
+This can be changed via the `server_url` command line option.
+
+## FILES
+
+A sample YAML file accepted by `register_new_matrix_user` is described below:
+
+ registration_shared_secret: "s3cr3t"
+
+## OPTIONS
+
+ * `-u`, `--user`:
+ Local part of the new user. Will prompt if omitted.
+
+ * `-p`, `--password`:
+ New password for user. Will prompt if omitted. Supplying the password
+ on the command line is not recommended. Use the STDIN instead.
+
+ * `-a`, `--admin`:
+ Register new user as an admin. Will prompt if omitted.
+
+ * `-c`, `--config`:
+ Path to server config file containing the shared secret.
+
+ * `-k`, `--shared-secret`:
+ Shared secret as defined in server config file. This is an optional
+ parameter as it can be also supplied via the YAML file.
+
+ * `server_url`:
+ URL of the home server. Defaults to 'https://localhost:8448'.
+
+## EXAMPLES
+
+ $ register_new_matrix_user -u user1 -p p@ssword -a -c config.yaml
+
+## COPYRIGHT
+
+This man page was written by Rahul De <<rahulde@swecha.net>>
+for Debian GNU/Linux distribution.
+
+## SEE ALSO
+
+synctl(1), synapse_port_db(1), hash_password(1)
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000000..ad0e95c83d
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,18 @@
+#!/usr/bin/make -f
+
+# This file was automatically generated by stdeb 0.8.2 at
+# Fri, 12 Jun 2015 14:32:03 +0100
+export PYBUILD_NAME=matrix-synapse
+%:
+ dh $@ --with python2 --with systemd --buildsystem=pybuild --no-guessing-deps
+
+override_dh_auto_install:
+ python setup.py install --root=debian/matrix-synapse --install-layout=deb
+
+override_dh_auto_build:
+
+override_dh_installinit:
+ dh_installinit --no-start
+
+override_dh_auto_test:
+ PYTHONPATH=. trial tests
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000000..163aaf8d82
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/synapse_port_db.1 b/debian/synapse_port_db.1
new file mode 100644
index 0000000000..4e6bc04827
--- /dev/null
+++ b/debian/synapse_port_db.1
@@ -0,0 +1,98 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "SYNAPSE_PORT_DB" "1" "February 2017" "" ""
+.
+.SH "NAME"
+\fBsynapse_port_db\fR \- A script to port an existing synapse SQLite database to a new PostgreSQL database\.
+.
+.SH "SYNOPSIS"
+\fBsynapse_port_db\fR [\-v] \-\-sqlite\-database=\fIdbfile\fR \-\-postgres\-config=\fIyamlconfig\fR [\-\-curses] [\-\-batch\-size=\fIbatch\-size\fR]
+.
+.SH "DESCRIPTION"
+\fBsynapse_port_db\fR ports an existing synapse SQLite database to a new PostgreSQL database\.
+.
+.P
+SQLite database is specified with \fB\-\-sqlite\-database\fR option and PostgreSQL configuration required to connect to PostgreSQL database is provided using \fB\-\-postgres\-config\fR configuration\. The configuration is specified in YAML format\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fB\-v\fR
+Print log messages in \fBdebug\fR level instead of \fBinfo\fR level\.
+.
+.TP
+\fB\-\-sqlite\-database\fR
+The snapshot of the SQLite database file\. This must not be currently used by a running synapse server\.
+.
+.TP
+\fB\-\-postgres\-config\fR
+The database config file for the PostgreSQL database\.
+.
+.TP
+\fB\-\-curses\fR
+Display a curses based progress UI\.
+.
+.SH "CONFIG FILE"
+The postgres configuration file must be a valid YAML file with the following options\.
+.
+.IP "\(bu" 4
+\fBdatabase\fR: Database configuration section\. This section header can be ignored and the options below may be specified as top level keys\.
+.
+.IP "\(bu" 4
+\fBname\fR: Connector to use when connecting to the database\. This value must be \fBpsycopg2\fR\.
+.
+.IP "\(bu" 4
+\fBargs\fR: DB API 2\.0 compatible arguments to send to the \fBpsycopg2\fR module\.
+.
+.IP "\(bu" 4
+\fBdbname\fR \- the database name
+.
+.IP "\(bu" 4
+\fBuser\fR \- user name used to authenticate
+.
+.IP "\(bu" 4
+\fBpassword\fR \- password used to authenticate
+.
+.IP "\(bu" 4
+\fBhost\fR \- database host address (defaults to UNIX socket if not provided)
+.
+.IP "\(bu" 4
+\fBport\fR \- connection port number (defaults to 5432 if not provided)
+.
+.IP "" 0
+
+.
+.IP "\(bu" 4
+\fBsynchronous_commit\fR: Optional\. Default is True\. If the value is \fBFalse\fR, enable asynchronous commit and don\'t wait for the server to call fsync before ending the transaction\. See: https://www\.postgresql\.org/docs/current/static/wal\-async\-commit\.html
+.
+.IP "" 0
+
+.
+.IP "" 0
+.
+.P
+Following example illustrates the configuration file format\.
+.
+.IP "" 4
+.
+.nf
+
+database:
+ name: psycopg2
+ args:
+ dbname: synapsedb
+ user: synapseuser
+ password: ORohmi9Eet=ohphi
+ host: localhost
+ synchronous_commit: false
+.
+.fi
+.
+.IP "" 0
+.
+.SH "COPYRIGHT"
+This man page was written by Sunil Mohan Adapa <\fIsunil@medhas\.org\fR> for Debian GNU/Linux distribution\.
+.
+.SH "SEE ALSO"
+synctl(1), hash_password(1), register_new_matrix_user(1)
diff --git a/debian/synapse_port_db.ronn b/debian/synapse_port_db.ronn
new file mode 100644
index 0000000000..fcb32ebd0d
--- /dev/null
+++ b/debian/synapse_port_db.ronn
@@ -0,0 +1,87 @@
+synapse_port_db(1) -- A script to port an existing synapse SQLite database to a new PostgreSQL database.
+=============================================
+
+## SYNOPSIS
+
+`synapse_port_db` [-v] --sqlite-database=<dbfile> --postgres-config=<yamlconfig> [--curses] [--batch-size=<batch-size>]
+
+## DESCRIPTION
+
+**synapse_port_db** ports an existing synapse SQLite database to a new
+PostgreSQL database.
+
+SQLite database is specified with `--sqlite-database` option and
+PostgreSQL configuration required to connect to PostgreSQL database is
+provided using `--postgres-config` configuration. The configuration
+is specified in YAML format.
+
+## OPTIONS
+
+ * `-v`:
+ Print log messages in `debug` level instead of `info` level.
+
+ * `--sqlite-database`:
+ The snapshot of the SQLite database file. This must not be
+ currently used by a running synapse server.
+
+ * `--postgres-config`:
+ The database config file for the PostgreSQL database.
+
+ * `--curses`:
+ Display a curses based progress UI.
+
+## CONFIG FILE
+
+The postgres configuration file must be a valid YAML file with the
+following options.
+
+ * `database`:
+ Database configuration section. This section header can be
+ ignored and the options below may be specified as top level
+ keys.
+
+ * `name`:
+ Connector to use when connecting to the database. This value must
+ be `psycopg2`.
+
+ * `args`:
+ DB API 2.0 compatible arguments to send to the `psycopg2` module.
+
+ * `dbname` - the database name
+
+ * `user` - user name used to authenticate
+
+ * `password` - password used to authenticate
+
+ * `host` - database host address (defaults to UNIX socket if not
+ provided)
+
+ * `port` - connection port number (defaults to 5432 if not
+ provided)
+
+
+ * `synchronous_commit`:
+ Optional. Default is True. If the value is `False`, enable
+ asynchronous commit and don't wait for the server to call fsync
+ before ending the transaction. See:
+ https://www.postgresql.org/docs/current/static/wal-async-commit.html
+
+Following example illustrates the configuration file format.
+
+ database:
+ name: psycopg2
+ args:
+ dbname: synapsedb
+ user: synapseuser
+ password: ORohmi9Eet=ohphi
+ host: localhost
+ synchronous_commit: false
+
+## COPYRIGHT
+
+This man page was written by Sunil Mohan Adapa <<sunil@medhas.org>> for
+Debian GNU/Linux distribution.
+
+## SEE ALSO
+
+synctl(1), hash_password(1), register_new_matrix_user(1)
diff --git a/debian/synctl.1 b/debian/synctl.1
new file mode 100644
index 0000000000..437f8f9e0e
--- /dev/null
+++ b/debian/synctl.1
@@ -0,0 +1,63 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "SYNCTL" "1" "February 2017" "" ""
+.
+.SH "NAME"
+\fBsynctl\fR \- Synapse server control interface
+.
+.SH "SYNOPSIS"
+Start, stop or restart synapse server\.
+.
+.P
+\fBsynctl\fR {start|stop|restart} [configfile] [\-w|\-\-worker=\fIWORKERCONFIG\fR] [\-a|\-\-all\-processes=\fIWORKERCONFIGDIR\fR]
+.
+.SH "DESCRIPTION"
+\fBsynctl\fR can be used to start, stop or restart Synapse server\. The control operation can be done on all processes or a single worker process\.
+.
+.SH "OPTIONS"
+.
+.TP
+\fBaction\fR
+The value of action should be one of \fBstart\fR, \fBstop\fR or \fBrestart\fR\.
+.
+.TP
+\fBconfigfile\fR
+Optional path of the configuration file to use\. Default value is \fBhomeserver\.yaml\fR\. The configuration file must exist for the operation to succeed\.
+.
+.TP
+\fB\-w\fR, \fB\-\-worker\fR:
+.
+.IP
+Perform start, stop or restart operations on a single worker\. Incompatible with \fB\-a\fR|\fB\-\-all\-processes\fR\. Value passed must be a valid worker\'s configuration file\.
+.
+.TP
+\fB\-a\fR, \fB\-\-all\-processes\fR:
+.
+.IP
+Perform start, stop or restart operations on all the workers in the given directory and the main synapse process\. Incompatible with \fB\-w\fR|\fB\-\-worker\fR\. Value passed must be a directory containing valid work configuration files\. All files ending with \fB\.yaml\fR extension shall be considered as configuration files and all other files in the directory are ignored\.
+.
+.SH "CONFIGURATION FILE"
+Configuration file may be generated as follows:
+.
+.IP "" 4
+.
+.nf
+
+$ python \-B \-m synapse\.app\.homeserver \-c config\.yaml \-\-generate\-config \-\-server\-name=<server name>
+.
+.fi
+.
+.IP "" 0
+.
+.SH "ENVIRONMENT"
+.
+.TP
+\fBSYNAPSE_CACHE_FACTOR\fR
+Synapse\'s architecture is quite RAM hungry currently \- a lot of recent room data and metadata is deliberately cached in RAM in order to speed up common requests\. This will be improved in future, but for now the easiest way to either reduce the RAM usage (at the risk of slowing things down) is to set the SYNAPSE_CACHE_FACTOR environment variable\. Roughly speaking, a SYNAPSE_CACHE_FACTOR of 1\.0 will max out at around 3\-4GB of resident memory \- this is what we currently run the matrix\.org on\. The default setting is currently 0\.1, which is probably around a ~700MB footprint\. You can dial it down further to 0\.02 if desired, which targets roughly ~512MB\. Conversely you can dial it up if you need performance for lots of users and have a box with a lot of RAM\.
+.
+.SH "COPYRIGHT"
+This man page was written by Sunil Mohan Adapa <\fIsunil@medhas\.org\fR> for Debian GNU/Linux distribution\.
+.
+.SH "SEE ALSO"
+synapse_port_db(1), hash_password(1), register_new_matrix_user(1)
diff --git a/debian/synctl.ronn b/debian/synctl.ronn
new file mode 100644
index 0000000000..a73c832f62
--- /dev/null
+++ b/debian/synctl.ronn
@@ -0,0 +1,70 @@
+synctl(1) -- Synapse server control interface
+=============================================
+
+## SYNOPSIS
+ Start, stop or restart synapse server.
+
+`synctl` {start|stop|restart} [configfile] [-w|--worker=<WORKERCONFIG>] [-a|--all-processes=<WORKERCONFIGDIR>]
+
+## DESCRIPTION
+
+**synctl** can be used to start, stop or restart Synapse server. The
+control operation can be done on all processes or a single worker
+process.
+
+## OPTIONS
+
+ * `action`:
+ The value of action should be one of `start`, `stop` or `restart`.
+
+ * `configfile`:
+ Optional path of the configuration file to use. Default value is
+ `homeserver.yaml`. The configuration file must exist for the
+ operation to succeed.
+
+ * `-w`, `--worker`:
+
+ Perform start, stop or restart operations on a single worker.
+ Incompatible with `-a`|`--all-processes`. Value passed must be a
+ valid worker's configuration file.
+
+ * `-a`, `--all-processes`:
+
+ Perform start, stop or restart operations on all the workers in
+ the given directory and the main synapse process. Incompatible
+ with `-w`|`--worker`. Value passed must be a directory containing
+ valid work configuration files. All files ending with `.yaml`
+ extension shall be considered as configuration files and all other
+ files in the directory are ignored.
+
+## CONFIGURATION FILE
+
+Configuration file may be generated as follows:
+
+ $ python -B -m synapse.app.homeserver -c config.yaml --generate-config --server-name=<server name>
+
+## ENVIRONMENT
+
+ * `SYNAPSE_CACHE_FACTOR`:
+ Synapse's architecture is quite RAM hungry currently - a lot of
+ recent room data and metadata is deliberately cached in RAM in
+ order to speed up common requests. This will be improved in
+ future, but for now the easiest way to either reduce the RAM usage
+ (at the risk of slowing things down) is to set the
+ SYNAPSE_CACHE_FACTOR environment variable. Roughly speaking, a
+ SYNAPSE_CACHE_FACTOR of 1.0 will max out at around 3-4GB of
+ resident memory - this is what we currently run the matrix.org
+ on. The default setting is currently 0.1, which is probably around
+ a ~700MB footprint. You can dial it down further to 0.02 if
+ desired, which targets roughly ~512MB. Conversely you can dial it
+ up if you need performance for lots of users and have a box with a
+ lot of RAM.
+
+## COPYRIGHT
+
+This man page was written by Sunil Mohan Adapa <<sunil@medhas.org>> for
+Debian GNU/Linux distribution.
+
+## SEE ALSO
+
+synapse_port_db(1), hash_password(1), register_new_matrix_user(1)
diff --git a/debian/templates b/debian/templates
new file mode 100644
index 0000000000..647358731c
--- /dev/null
+++ b/debian/templates
@@ -0,0 +1,19 @@
+Template: matrix-synapse/server-name
+Type: string
+_Description: Name of the server:
+ The name that this homeserver will appear as, to clients and other
+ servers via federation. This name should match the SRV record
+ published in DNS.
+
+Template: matrix-synapse/report-stats
+Type: boolean
+Default: false
+_Description: Report anonymous statistics?
+ Developers of Matrix and Synapse really appreciate helping the
+ project out by reporting anonymized usage statistics from this
+ homeserver. Only very basic aggregate data (e.g. number of users)
+ will be reported, but it helps track the growth of the Matrix
+ community, and helps in making Matrix a success, as well as to
+ convince other networks that they should peer with Matrix.
+ .
+ Thank you.
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000000..b1b10d4cd0
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,11 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+
+opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/matrix-synapse-$1\.tar\.gz/,uversionmangle=s/-?rc/~rc/ \
+ https://github.com/matrix-org/synapse/tags .*/v?(\d[^\s\-]*)\.tar\.gz debian uupdate
From 1a6d5bfa08b4ba618dcab68e4ed524c4db07da2b Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 20 Dec 2018 11:33:29 +0000
Subject: [PATCH 05/12] Debian packaging via dh_virtualenv (#4285)
---
.dockerignore | 2 +
.gitignore | 8 +-
MANIFEST.in | 1 +
changelog.d/4212.misc | 1 +
debian/.gitignore | 7 +
debian/NEWS | 22 +++
debian/build_virtualenv | 48 +++++
debian/changelog | 11 ++
debian/control | 92 +++------
debian/copyright | 2 +-
debian/gbp.conf | 5 -
debian/homeserver.yaml | 10 +-
debian/matrix-synapse-py3.links | 4 +
.../{postinst => matrix-synapse-py3.postinst} | 0
debian/matrix-synapse-py3.preinst | 31 +++
debian/matrix-synapse-py3.triggers | 9 +
debian/matrix-synapse.init | 184 ------------------
debian/matrix-synapse.service | 4 +-
debian/patches/0001-tox.patch | 19 --
debian/patches/0002-change_instructions.patch | 34 ----
.../patches/0004-webclient-instructions.patch | 27 ---
...equire-strict-nacl-0.3.0-requirement.patch | 21 --
debian/patches/bcrypt.patch | 30 ---
debian/patches/no_install_with_pip | 43 ----
debian/patches/remove-webclient.patch | 31 ---
debian/patches/series | 7 -
debian/pydist-overrides | 5 -
debian/rules | 30 +--
debian/source/format | 2 +-
debian/watch | 11 --
docker/Dockerfile-dhvirtualenv | 35 ++++
docker/build_debian.sh | 41 ++++
docker/build_debian_packages.sh | 39 ++++
synapse/python_dependencies.py | 2 +-
synapse/storage/e2e_room_keys.py | 2 +-
tox.ini | 1 +
36 files changed, 311 insertions(+), 510 deletions(-)
create mode 100644 changelog.d/4212.misc
create mode 100644 debian/.gitignore
create mode 100644 debian/NEWS
create mode 100755 debian/build_virtualenv
delete mode 100644 debian/gbp.conf
create mode 100644 debian/matrix-synapse-py3.links
rename debian/{postinst => matrix-synapse-py3.postinst} (100%)
mode change 100755 => 100644
create mode 100644 debian/matrix-synapse-py3.preinst
create mode 100644 debian/matrix-synapse-py3.triggers
delete mode 100755 debian/matrix-synapse.init
delete mode 100644 debian/patches/0001-tox.patch
delete mode 100644 debian/patches/0002-change_instructions.patch
delete mode 100644 debian/patches/0004-webclient-instructions.patch
delete mode 100644 debian/patches/0006-Don-t-require-strict-nacl-0.3.0-requirement.patch
delete mode 100644 debian/patches/bcrypt.patch
delete mode 100644 debian/patches/no_install_with_pip
delete mode 100644 debian/patches/remove-webclient.patch
delete mode 100644 debian/patches/series
delete mode 100644 debian/pydist-overrides
delete mode 100644 debian/watch
create mode 100644 docker/Dockerfile-dhvirtualenv
create mode 100644 docker/build_debian.sh
create mode 100755 docker/build_debian_packages.sh
diff --git a/.dockerignore b/.dockerignore
index 0180602e56..3c3996eb4c 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,3 +5,5 @@ demo/etc
tox.ini
.git/*
.tox/*
+debian/matrix-synapse/
+debian/matrix-synapse-*/
diff --git a/.gitignore b/.gitignore
index 3b2252ad8a..1b632646bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@ homeserver*.db
homeserver*.log
homeserver*.log.*
homeserver*.pid
-homeserver*.yaml
+/homeserver*.yaml
*.signing.key
*.tls.crt
@@ -26,6 +26,8 @@ homeserver*.yaml
*.tls.key
.coverage
+.coverage.*
+!.coverage.rc
htmlcov
demo/*/*.db
@@ -57,3 +59,7 @@ env/
.vscode/
.ropeproject/
+
+*.deb
+
+/debs
diff --git a/MANIFEST.in b/MANIFEST.in
index ec18819bc9..29303cc8b5 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -36,6 +36,7 @@ prune demo/etc
prune docker
prune .circleci
prune .coveragerc
+prune debian
exclude jenkins*
recursive-exclude jenkins *.sh
diff --git a/changelog.d/4212.misc b/changelog.d/4212.misc
new file mode 100644
index 0000000000..42f2546cf9
--- /dev/null
+++ b/changelog.d/4212.misc
@@ -0,0 +1 @@
+Debian packages utilising a virtualenv with bundled dependencies can now be built.
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000000..f027374ae2
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,7 @@
+/matrix-synapse-py3.*.debhelper
+/matrix-synapse-py3.debhelper.log
+/matrix-synapse-py3.substvars
+/matrix-synapse-*/
+/files
+/debhelper-build-stamp
+/.debhelper
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000000..367e08f851
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,22 @@
+matrix-synapse-py3 (0.34.0) stable; urgency=medium
+
+ matrix-synapse-py3 is intended as a drop-in replacement for the existing
+ matrix-synapse package. The replacement should be relatively seamless,
+ however, please note the following important differences to matrix-synapse:
+
+ * Most importantly, the matrix-synapse service now runs under Python 3 rather
+ than Python 2.7.
+
+ * Synapse is installed into its own virtualenv (in /opt/venvs/matrix-synapse)
+ instead of using the system python libraries. (This may mean that you can
+ remove a number of old dependencies with `apt-get autoremove`).
+
+ matrix-synapse-py3 will take over responsibility for the existing
+ configuration files, including the matrix-synapse systemd service.
+
+ Beware, however, that `apt-get purge matrix-synapse` will *disable* the
+ matrix-synapse service (so that it will not be started on reboot), even
+ though that service is no longer being provided by the matrix-synapse
+ package. It can be re-enabled with `systemctl enable matrix-synapse`.
+
+ -- Richard van der Hoff <richard@matrix.org> Wed, 19 Dec 2018 14:00:00 +0000
diff --git a/debian/build_virtualenv b/debian/build_virtualenv
new file mode 100755
index 0000000000..61ffb13192
--- /dev/null
+++ b/debian/build_virtualenv
@@ -0,0 +1,48 @@
+#!/bin/bash
+#
+# runs dh_virtualenv to build the virtualenv in the build directory,
+# and then runs the trial tests against the installed synapse.
+
+set -e
+
+export DH_VIRTUALENV_INSTALL_ROOT=/opt/venvs
+SNAKE=/usr/bin/python3
+
+# try to set the CFLAGS so any compiled C extensions are compiled with the most
+# generic as possible x64 instructions, so that compiling it on a new Intel chip
+# doesn't enable features not available on older ones or AMD.
+#
+# TODO: add similar things for non-amd64, or figure out a more generic way to
+# do this.
+
+case `dpkg-architecture -q DEB_HOST_ARCH` in
+ amd64)
+ export CFLAGS=-march=x86-64
+ ;;
+esac
+
+# Use --builtin-venv to use the better `venv` module from CPython 3.4+ rather
+# than the 2/3 compatible `virtualenv`.
+
+dh_virtualenv \
+ --install-suffix "matrix-synapse" \
+ --builtin-venv \
+ --setuptools \
+ --python "$SNAKE" \
+ --upgrade-pip \
+ --preinstall="lxml" \
+ --preinstall="mock" \
+ --extra-pip-arg="--no-cache-dir" \
+ --extra-pip-arg="--compile"
+
+# we copy the tests to a temporary directory so that we can put them on the
+# PYTHONPATH without putting the uninstalled synapse on the pythonpath.
+tmpdir=`mktemp -d`
+trap "rm -r $tmpdir" EXIT
+
+cp -r tests "$tmpdir"
+cd debian/matrix-synapse-py3
+
+PYTHONPATH="$tmpdir" \
+ ./opt/venvs/matrix-synapse/bin/python \
+ -B -m twisted.trial --reporter=text -j2 tests
diff --git a/debian/changelog b/debian/changelog
index 20167978cf..040c8e7cd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+matrix-synapse-py3 (0.34.0) stable; urgency=medium
+
+ * New synapse release 0.34.0.
+ * Synapse is now installed into a Python 3 virtual environment with
+ up-to-date dependencies.
+ * The matrix-synapse service will now be restarted when the package is
+ upgraded.
+ (Fixes https://github.com/matrix-org/package-synapse-debian/issues/18)
+
+ -- Synapse packaging team <packages@matrix.org> Wed, 19 Dec 2018 14:00:00 +0000
+
matrix-synapse (0.33.9-1matrix1) stretch; urgency=medium
[ Erik Johnston ]
diff --git a/debian/control b/debian/control
index 854d9688f3..552a81dcb0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,77 +1,37 @@
-Source: matrix-synapse
-Maintainer: Erik Johnston <erikj@matrix.org>
-Section: python
-Priority: optional
+Source: matrix-synapse-py3
+Section: contrib/python
+Priority: extra
+Maintainer: Synapse Packaging team <packages@matrix.org>
Build-Depends:
debhelper (>= 9),
- dh-python,
- dh-systemd (>= 1.5),
- po-debconf,
- python (>= 2.6.6-3),
- python-bcrypt,
- python-blist,
- python-canonicaljson (>=1.1.3),
- python-daemonize,
- python-frozendict (>= 0.4),
- python-lxml,
- python-mock,
- python-msgpack (>=0.3.0),
- python-nacl (>= 0.3.0),
- python-netaddr,
- python-openssl (>= 0.14),
- python-pil,
- python-psutil,
- python-pyasn1,
- python-pydenticon,
- python-pymacaroons-pynacl,
- python-pysaml2,
- python-service-identity (>= 1.0.0),
- python-setuptools (>= 0.6b3),
- python-signedjson (>= 1.0.0),
- python-sortedcontainers,
- python-syutil (>= 0.0.7),
- python-treq (>= 15.1.0),
- python-twisted (>= 17.1.0),
- python-unpaddedbase64 (>= 1.0.1),
- python-yaml,
- python-phonenumbers (>= 8.2.0),
- python-jsonschema (>=2.5.1),
- python-prometheus-client,
- python-attr
-Standards-Version: 3.9.8
-X-Python-Version: >= 2.7
+ dh-systemd,
+ dh-virtualenv (>= 1.0),
+ lsb-release,
+ python3-dev,
+ python3,
+ python3-setuptools,
+ python3-pip,
+ python3-venv,
+ tar,
+Standards-Version: 3.9.5
+Homepage: https://github.com/matrix-org/synapse
-Package: matrix-synapse
-Architecture: all
+Package: matrix-synapse-py3
+Architecture: amd64
+Conflicts: matrix-synapse
+Pre-Depends: dpkg (>= 1.16.1)
Depends:
- ${misc:Depends},
- ${python:Depends},
adduser,
debconf,
- lsb-base (>= 3.0-6),
- python-attr (>= 16.0.0),
- python-twisted (>= 17.1.0),
- python-canonicaljson (>=1.1.3),
- python-prometheus-client (>=0.0.14),
+ python3-distutils|libpython3-stdlib (<< 3.6),
+ python3,
+ ${misc:Depends},
+# some of our scripts use perl, but none of them are important,
+# so we put perl:Depends in Suggests rather than Depends.
Suggests:
- python-bleach (>= 1.4.2),
- python-jinja2 (>= 2.8),
-Recommends:
- python-psycopg2,
- python-lxml,
+ sqlite3,
+ ${perl:Depends},
Description: Open federated Instant Messaging and VoIP server
Matrix is an ambitious new ecosystem for open federated Instant
Messaging and VoIP. Synapse is a reference Matrix server
implementation.
- .
- Everything in Matrix happens in a room. Rooms are distributed and do
- not exist on any single server. Rooms can be located using
- convenience aliases like #matrix:matrix.org or #test:localhost:8448.
- .
- Matrix user IDs look like @matthew:matrix.org (although in the future
- you will normally refer to yourself and others using a 3PID: email
- address, phone number, etc rather than manipulating Matrix user IDs)
- .
- The overall architecture is:
- client <------> homeserver <=============> homeserver <------> client
- https://a.org/_matrix https://b.net/_matrix
diff --git a/debian/copyright b/debian/copyright
index 35597e0804..95c21ea12a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: synapse
Source: https://github.com/matrix-org/synapse
Files: *
-Copyright: 2014-2017, OpenMarket Ltd
+Copyright: 2014-2017, OpenMarket Ltd, 2017-2018 New Vector Ltd
License: Apache-2.0
Files: synapse/config/saml2.py
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 0432accfa0..0000000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-debian-branch = debian
-
-[dch]
-distribution = stable
diff --git a/debian/homeserver.yaml b/debian/homeserver.yaml
index 04ece25d49..188a2d5483 100644
--- a/debian/homeserver.yaml
+++ b/debian/homeserver.yaml
@@ -70,13 +70,9 @@ pid_file: "/var/run/matrix-synapse.pid"
#
# cpu_affinity: 0xFFFFFFFF
-# Whether to serve a web client from the HTTP/HTTPS root resource.
-web_client: False
-
-# The root directory to server for the above web client.
-# If left undefined, synapse will serve the matrix-angular-sdk web client.
-# Make sure matrix-angular-sdk is installed with pip if web_client is True
-# and web_client_location is undefined
+# The path to the web client which will be served at /_matrix/client/
+# if 'webclient' is configured under the 'listeners' configuration.
+#
# web_client_location: "/path/to/web/root"
# The public-facing base URL for the client API (not including _matrix/...)
diff --git a/debian/matrix-synapse-py3.links b/debian/matrix-synapse-py3.links
new file mode 100644
index 0000000000..bf19efa562
--- /dev/null
+++ b/debian/matrix-synapse-py3.links
@@ -0,0 +1,4 @@
+opt/venvs/matrix-synapse/bin/hash_password usr/bin/hash_password
+opt/venvs/matrix-synapse/bin/register_new_matrix_user usr/bin/register_new_matrix_user
+opt/venvs/matrix-synapse/bin/synapse_port_db usr/bin/synapse_port_db
+opt/venvs/matrix-synapse/bin/synctl usr/bin/synctl
diff --git a/debian/postinst b/debian/matrix-synapse-py3.postinst
old mode 100755
new mode 100644
similarity index 100%
rename from debian/postinst
rename to debian/matrix-synapse-py3.postinst
diff --git a/debian/matrix-synapse-py3.preinst b/debian/matrix-synapse-py3.preinst
new file mode 100644
index 0000000000..4b5612f050
--- /dev/null
+++ b/debian/matrix-synapse-py3.preinst
@@ -0,0 +1,31 @@
+#!/bin/sh -e
+
+# Attempt to undo some of the braindamage caused by
+# https://github.com/matrix-org/package-synapse-debian/issues/18.
+#
+# Due to reasons [1], the old python2 matrix-synapse package will not stop the
+# service when the package is uninstalled. Our maintainer scripts will do the
+# right thing in terms of ensuring the service is enabled and unmasked, but
+# then do a `systemctl start matrix-synapse`, which of course does nothing -
+# leaving the old (py2) service running.
+#
+# There should normally be no reason for the service to be running during our
+# preinst, so we assume that if it *is* running, it's due to that situation,
+# and stop it.
+#
+# [1] dh_systemd_start doesn't do anything because it sees that there is an
+# init.d script with the same name, so leaves it to dh_installinit.
+#
+# dh_installinit doesn't do anything because somebody gave it a --no-start
+# for unknown reasons.
+
+if [ -x /bin/systemctl ]; then
+ if /bin/systemctl --quiet is-active -- matrix-synapse; then
+ echo >&2 "stopping existing matrix-synapse service"
+ /bin/systemctl stop matrix-synapse || true
+ fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/matrix-synapse-py3.triggers b/debian/matrix-synapse-py3.triggers
new file mode 100644
index 0000000000..f8c1fdb021
--- /dev/null
+++ b/debian/matrix-synapse-py3.triggers
@@ -0,0 +1,9 @@
+# Register interest in Python interpreter changes and
+# don't make the Python package dependent on the virtualenv package
+# processing (noawait)
+interest-noawait /usr/bin/python3.5
+interest-noawait /usr/bin/python3.6
+interest-noawait /usr/bin/python3.7
+
+# Also provide a symbolic trigger for all dh-virtualenv packages
+interest dh-virtualenv-interpreter-update
diff --git a/debian/matrix-synapse.init b/debian/matrix-synapse.init
deleted file mode 100755
index 7a9e8b3296..0000000000
--- a/debian/matrix-synapse.init
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides: matrix-synapse
-# Required-Start: $local_fs $network $remote_fs $syslog
-# Required-Stop: $local_fs $network $remote_fs $syslog
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: <Enter a short description of the software>
-# Description: <Enter a long description of the software>
-# <...>
-# <...>
-### END INIT INFO
-
-# Author: Paul "LeoNerd" Evans <paul@matrix.org>
-
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="matrix-synapse"
-NAME=matrix-synapse
-SCRIPTNAME=/etc/init.d/$NAME
-
-PYTHON="/usr/bin/python"
-CONFIGS="--config-path /etc/matrix-synapse/homeserver.yaml --config-path /etc/matrix-synapse/conf.d/"
-USER="matrix-synapse"
-SHAREDIR=/var/lib/$NAME
-
-# Exit if the package is not installed
-[ -f "/etc/matrix-synapse/homeserver.yaml" ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-get_config_key()
-{
- python -m synapse.config read "$1" $CONFIGS || return 2
-}
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
- # Running --generate-config to create keys if any are absent.
- # Doesn't matter if not
- $PYTHON -m "synapse.app.homeserver" $CONFIGS --generate-keys || return 2
-
- # Return
- # 0 if daemon has been started
- # 1 if daemon was already running
- # 2 if daemon could not be started
- PIDFILE=`get_config_key "pid_file"`
- RETVAL=$?
- if [ "$RETVAL" != 0 ]; then
- return $RETVAL
- fi
- if [ -r "$PIDFILE" ]; then
- kill -0 `cat $PIDFILE` && return 1
- fi
-
- export PYTHONPATH
-
- # Create the PID file so that synapse can write to it as nonroot
- touch $PIDFILE
- chown $USER:nogroup $PIDFILE
- chown $USER:nogroup $SHAREDIR/media/
- chown $USER:nogroup $SHAREDIR/uploads/
-
- start-stop-daemon --start --pidfile $PIDFILE --chuid $USER \
- --exec $PYTHON -- -m "synapse.app.homeserver" $CONFIGS --daemonize || return 2
-
- return 0
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
- # Return
- # 0 if daemon has been stopped
- # 1 if daemon was already stopped
- # 2 if daemon could not be stopped
- # other if a failure occurred
- PIDFILE=`get_config_key "pid_file"`
- RETVAL=$?
- if [ "$RETVAL" != 0 ]; then
- return $RETVAL
- fi
-
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --user $USER --exec $PYTHON
- RETVAL="$?"
- [ "$RETVAL" = 2 ] && return 2
-
- # Many daemons don't delete their pidfiles when they exit.
- rm -f $PIDFILE
- return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
- #
- # If the daemon can reload its configuration without
- # restarting (for example, when it is sent a SIGHUP),
- # then implement that here.
- #
- return 1
-}
-
-case "$1" in
- start)
- [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
- do_start
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- stop)
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
- 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
- esac
- ;;
- status)
- PIDFILE=`get_config_key "pid_file"`
- RETVAL=$?
- if [ "$RETVAL" != 0 ]; then
- return $RETVAL
- fi
- status_of_proc -p "$PIDFILE" "$PYTHON" "$NAME" && exit 0 || exit $?
- ;;
- #reload|force-reload)
- #
- # If do_reload() is not implemented then leave this commented out
- # and leave 'force-reload' as an alias for 'restart'.
- #
- #log_daemon_msg "Reloading $DESC" "$NAME"
- #do_reload
- #log_end_msg $?
- #;;
- restart|force-reload)
- #
- # If the "reload" option is implemented then remove the
- # 'force-reload' alias
- #
- log_daemon_msg "Restarting $DESC" "$NAME"
- do_stop
- case "$?" in
- 0|1)
- do_start
- case "$?" in
- 0) log_end_msg 0 ;;
- 1) log_end_msg 1 ;; # Old process is still running
- *) log_end_msg 1 ;; # Failed to start
- esac
- ;;
- *)
- # Failed to stop
- log_end_msg 1
- ;;
- esac
- ;;
- *)
- #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-:
diff --git a/debian/matrix-synapse.service b/debian/matrix-synapse.service
index ab94e073a6..2e9cd83b5f 100644
--- a/debian/matrix-synapse.service
+++ b/debian/matrix-synapse.service
@@ -6,8 +6,8 @@ Type=simple
User=matrix-synapse
WorkingDirectory=/var/lib/matrix-synapse
EnvironmentFile=/etc/default/matrix-synapse
-ExecStartPre=/usr/bin/python -m synapse.app.homeserver --config-path=/etc/matrix-synapse/homeserver.yaml --config-path=/etc/matrix-synapse/conf.d/ --generate-keys
-ExecStart=/usr/bin/python -m synapse.app.homeserver --config-path=/etc/matrix-synapse/homeserver.yaml --config-path=/etc/matrix-synapse/conf.d/
+ExecStartPre=/opt/venvs/matrix-synapse/bin/python -m synapse.app.homeserver --config-path=/etc/matrix-synapse/homeserver.yaml --config-path=/etc/matrix-synapse/conf.d/ --generate-keys
+ExecStart=/opt/venvs/matrix-synapse/bin/python -m synapse.app.homeserver --config-path=/etc/matrix-synapse/homeserver.yaml --config-path=/etc/matrix-synapse/conf.d/
Restart=always
RestartSec=3
diff --git a/debian/patches/0001-tox.patch b/debian/patches/0001-tox.patch
deleted file mode 100644
index 2cf3ec0fe8..0000000000
--- a/debian/patches/0001-tox.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Erik Johnston <erikj@matrix.org>
-Date: Fri, 10 Jun 2016 10:57:07 +0100
-Subject: tox
-
----
- tox.ini | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: package-synapse-debian/tox.ini
-===================================================================
---- package-synapse-debian.orig/tox.ini
-+++ package-synapse-debian/tox.ini
-@@ -1,5 +1,6 @@
- [tox]
- envlist = packaging, py27, py36, pep8, check_isort
-+sitepackages = True
-
- [base]
- deps =
diff --git a/debian/patches/0002-change_instructions.patch b/debian/patches/0002-change_instructions.patch
deleted file mode 100644
index 933de3ab94..0000000000
--- a/debian/patches/0002-change_instructions.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Erik Johnston <erikj@matrix.org>
-Date: Fri, 10 Jun 2016 10:57:07 +0100
-Subject: change_instructions
-
----
- synapse/config/_base.py | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/synapse/config/_base.py
-+++ b/synapse/config/_base.py
-@@ -31,6 +31,11 @@
- MISSING_REPORT_STATS_CONFIG_INSTRUCTIONS = """\
- Please opt in or out of reporting anonymized homeserver usage statistics, by
- setting the `report_stats` key in your config file to either True or False.
-+
-+To set it run:
-+
-+ dpkg-reconfigure matrix-synapse
-+
- """
-
- MISSING_REPORT_STATS_SPIEL = """\
-@@ -45,6 +50,11 @@
-
- MISSING_SERVER_NAME = """\
- Missing mandatory `server_name` config option.
-+
-+To set it run:
-+
-+ dpkg-reconfigure matrix-synapse
-+
- """
-
-
diff --git a/debian/patches/0004-webclient-instructions.patch b/debian/patches/0004-webclient-instructions.patch
deleted file mode 100644
index e2e61a8446..0000000000
--- a/debian/patches/0004-webclient-instructions.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Erik Johnston <erikj@matrix.org>
-Date: Fri, 10 Jun 2016 10:57:07 +0100
-Subject: webclient-instructions
-
----
- synapse/app/homeserver.py | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-Index: package-synapse-debian/synapse/app/homeserver.py
-===================================================================
---- package-synapse-debian.orig/synapse/app/homeserver.py
-+++ package-synapse-debian/synapse/app/homeserver.py
-@@ -86,12 +86,11 @@ def build_resource_for_web_client(hs):
- "Please either install the matrix-angular-sdk or configure\n"
- "the location of the source to serve via the configuration\n"
- "option `web_client_location`\n\n"
-- "To install the `matrix-angular-sdk` via pip, run:\n\n"
-- " pip install '%(dep)s'\n"
-+ "To install the `matrix-angular-sdk` via apt-get, run:\n\n"
-+ " apt-get install matrix-synapse-angular-client\n"
- "\n"
- "You can also disable hosting of the webclient via the\n"
- "configuration option `web_client`\n"
-- % {"dep": CONDITIONAL_REQUIREMENTS["web_client"].keys()[0]}
- )
- syweb_path = os.path.dirname(syweb.__file__)
- webclient_path = os.path.join(syweb_path, "webclient")
diff --git a/debian/patches/0006-Don-t-require-strict-nacl-0.3.0-requirement.patch b/debian/patches/0006-Don-t-require-strict-nacl-0.3.0-requirement.patch
deleted file mode 100644
index 8370c96166..0000000000
--- a/debian/patches/0006-Don-t-require-strict-nacl-0.3.0-requirement.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Erik Johnston <erikj@matrix.org>
-Date: Mon, 20 Jun 2016 13:20:37 +0100
-Subject: Don't require strict nacl==0.3.0 requirement
-
----
- synapse/python_dependencies.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: package-synapse-debian/synapse/python_dependencies.py
-===================================================================
---- package-synapse-debian.orig/synapse/python_dependencies.py
-+++ package-synapse-debian/synapse/python_dependencies.py
-@@ -37,7 +37,7 @@ REQUIREMENTS = {
- "unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"],
- "canonicaljson>=1.1.3": ["canonicaljson>=1.1.3"],
- "signedjson>=1.0.0": ["signedjson>=1.0.0"],
-- "pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"],
-+ "pynacl>=0.3.0": ["nacl>=0.3.0", "nacl.bindings"],
- "service_identity>=16.0.0": ["service_identity>=16.0.0"],
- "Twisted>=17.1.0": ["twisted>=17.1.0"],
- "treq>=15.1": ["treq>=15.1"],
diff --git a/debian/patches/bcrypt.patch b/debian/patches/bcrypt.patch
deleted file mode 100644
index a962949920..0000000000
--- a/debian/patches/bcrypt.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: package-synapse-debian/synapse/handlers/auth.py
-===================================================================
---- package-synapse-debian.orig/synapse/handlers/auth.py
-+++ package-synapse-debian/synapse/handlers/auth.py
-@@ -921,10 +921,10 @@ class AuthHandler(BaseHandler):
- # Normalise the Unicode in the password
- pw = unicodedata.normalize("NFKC", password)
-
-- return bcrypt.checkpw(
-+ return bcrypt.hashpw(
- pw.encode('utf8') + self.hs.config.password_pepper.encode("utf8"),
- stored_hash
-- )
-+ ) == stored_hash
-
- if stored_hash:
- if not isinstance(stored_hash, bytes):
-Index: package-synapse-debian/synapse/python_dependencies.py
-===================================================================
---- package-synapse-debian.orig/synapse/python_dependencies.py
-+++ package-synapse-debian/synapse/python_dependencies.py
-@@ -49,7 +49,7 @@ REQUIREMENTS = {
- "pyasn1>=0.1.9": ["pyasn1"],
- "pyasn1-modules>=0.0.7": ["pyasn1_modules"],
- "daemonize>=2.3.1": ["daemonize"],
-- "bcrypt>=3.1.0": ["bcrypt>=3.1.0"],
-+ "bcrypt": ["bcrypt"],
- "pillow>=3.1.2": ["PIL"],
- "sortedcontainers>=1.4.4": ["sortedcontainers"],
- "psutil>=2.0.0": ["psutil>=2.0.0"],
diff --git a/debian/patches/no_install_with_pip b/debian/patches/no_install_with_pip
deleted file mode 100644
index 654656f596..0000000000
--- a/debian/patches/no_install_with_pip
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: package-synapse-debian/synapse/app/__init__.py
-===================================================================
---- package-synapse-debian.orig/synapse/app/__init__.py
-+++ package-synapse-debian/synapse/app/__init__.py
-@@ -25,8 +25,8 @@ try:
- except python_dependencies.MissingRequirementError as e:
- message = "\n".join([
- "Missing Requirement: %s" % (str(e),),
-- "To install run:",
-- " pip install --upgrade --force \"%s\"" % (e.dependency,),
-+ "To install, try:",
-+ " sudo apt-get install python-%s" % (e.dependency,),
- "",
- ])
- sys.stderr.writelines(message)
-Index: package-synapse-debian/synapse/config/jwt_config.py
-===================================================================
---- package-synapse-debian.orig/synapse/config/jwt_config.py
-+++ package-synapse-debian/synapse/config/jwt_config.py
-@@ -19,7 +19,7 @@ MISSING_JWT = (
- """Missing jwt library. This is required for jwt login.
-
- Install by running:
-- pip install pyjwt
-+ sudo apt-get install python-jwt
- """
- )
-
-Index: package-synapse-debian/synapse/config/repository.py
-===================================================================
---- package-synapse-debian.orig/synapse/config/repository.py
-+++ package-synapse-debian/synapse/config/repository.py
-@@ -27,9 +27,7 @@ MISSING_LXML = (
- """Missing lxml library. This is required for URL preview API.
-
- Install by running:
-- pip install lxml
--
-- Requires libxslt1-dev system package.
-+ sudo apt-get install python-lxml
- """
- )
-
diff --git a/debian/patches/remove-webclient.patch b/debian/patches/remove-webclient.patch
deleted file mode 100644
index bfd2fce576..0000000000
--- a/debian/patches/remove-webclient.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: package-synapse-debian/synapse/app/homeserver.py
-===================================================================
---- package-synapse-debian.orig/synapse/app/homeserver.py
-+++ package-synapse-debian/synapse/app/homeserver.py
-@@ -124,7 +124,7 @@ class SynapseHomeServer(HomeServer):
- for res in listener_config["resources"]:
- for name in res["names"]:
- resources.update(self._configure_named_resource(
-- name, res.get("compress", False),
-+ config, name, res.get("compress", False),
- ))
-
- additional_resources = listener_config.get("additional_resources", {})
-@@ -171,7 +171,7 @@ class SynapseHomeServer(HomeServer):
- )
- logger.info("Synapse now listening on port %d", port)
-
-- def _configure_named_resource(self, name, compress=False):
-+ def _configure_named_resource(self, config, name, compress=False):
- """Build a resource map for a named resource
-
- Args:
-@@ -235,7 +235,7 @@ class SynapseHomeServer(HomeServer):
- if name in ["keys", "federation"]:
- resources[SERVER_KEY_V2_PREFIX] = KeyApiV2Resource(self)
-
-- if name == "webclient":
-+ if name == "webclient" and config.web_client:
- resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self)
-
- if name == "metrics" and self.get_config().enable_metrics:
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ae46209e92..0000000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,7 +0,0 @@
-0001-tox.patch
-0002-change_instructions.patch
-0004-webclient-instructions.patch
-0006-Don-t-require-strict-nacl-0.3.0-requirement.patch
-remove-webclient.patch
-bcrypt.patch
-no_install_with_pip
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
deleted file mode 100644
index e2e34b7d30..0000000000
--- a/debian/pydist-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-matrix-angular-sdk
-jinja2
-bleach
-ldap3
-matrix-synapse-ldap3
diff --git a/debian/rules b/debian/rules
index ad0e95c83d..05cbbdde08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,22 @@
#!/usr/bin/make -f
+#
+# Build Debian package using https://github.com/spotify/dh-virtualenv
+#
-# This file was automatically generated by stdeb 0.8.2 at
-# Fri, 12 Jun 2015 14:32:03 +0100
-export PYBUILD_NAME=matrix-synapse
-%:
- dh $@ --with python2 --with systemd --buildsystem=pybuild --no-guessing-deps
-
-override_dh_auto_install:
- python setup.py install --root=debian/matrix-synapse --install-layout=deb
-
-override_dh_auto_build:
+override_dh_systemd_enable:
+ dh_systemd_enable --name=matrix-synapse
override_dh_installinit:
- dh_installinit --no-start
+ dh_installinit --name=matrix-synapse
-override_dh_auto_test:
- PYTHONPATH=. trial tests
+override_dh_strip:
+
+override_dh_shlibdeps:
+
+override_dh_virtualenv:
+ ./debian/build_virtualenv
+
+# We are restricted to compat level 9 (because xenial), so have to
+# enable the systemd bits manually.
+%:
+ dh $@ --with python-virtualenv --with systemd
diff --git a/debian/source/format b/debian/source/format
index 163aaf8d82..89ae9db8f8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index b1b10d4cd0..0000000000
--- a/debian/watch
+++ /dev/null
@@ -1,11 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-
-opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/matrix-synapse-$1\.tar\.gz/,uversionmangle=s/-?rc/~rc/ \
- https://github.com/matrix-org/synapse/tags .*/v?(\d[^\s\-]*)\.tar\.gz debian uupdate
diff --git a/docker/Dockerfile-dhvirtualenv b/docker/Dockerfile-dhvirtualenv
new file mode 100644
index 0000000000..ea6b650af2
--- /dev/null
+++ b/docker/Dockerfile-dhvirtualenv
@@ -0,0 +1,35 @@
+# A dockerfile which builds a docker image for building a debian package for
+# synapse. The distro to build for is passed as a docker build var.
+#
+# The default entrypoint expects the synapse source to be mounted as a
+# (read-only) volume at /synapse/source, and an output directory at /debs.
+#
+# A pair of environment variables (TARGET_USERID and TARGET_GROUPID) can be
+# passed to the docker container; if these are set, the build script will chown
+# the build products accordingly, to avoid ending up with things owned by root
+# in the host filesystem.
+
+# Get the distro we want to pull from as a dynamic build variable
+ARG distro=""
+FROM ${distro}
+
+# Install the build dependencies
+RUN apt-get update -qq -o Acquire::Languages=none \
+ && env DEBIAN_FRONTEND=noninteractive apt-get install \
+ -yqq --no-install-recommends -o Dpkg::Options::=--force-unsafe-io \
+ build-essential \
+ debhelper \
+ devscripts \
+ dh-systemd \
+ dh-virtualenv \
+ equivs \
+ lsb-release \
+ python3-dev \
+ python3-pip \
+ python3-setuptools \
+ python3-venv \
+ sqlite3 \
+ wget
+
+WORKDIR /synapse/source
+ENTRYPOINT ["bash","/synapse/source/docker/build_debian.sh"]
diff --git a/docker/build_debian.sh b/docker/build_debian.sh
new file mode 100644
index 0000000000..cea5067fe9
--- /dev/null
+++ b/docker/build_debian.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# The script to build the Debian package, as ran inside the Docker image.
+
+set -ex
+
+DIST=`lsb_release -c -s`
+
+# We need to build a newer dh_virtualenv on older OSes like Xenial.
+if [ "$DIST" = 'xenial' ]; then
+ mkdir -p /tmp/dhvenv
+ cd /tmp/dhvenv
+ wget https://github.com/spotify/dh-virtualenv/archive/1.1.tar.gz
+ tar xvf 1.1.tar.gz
+ cd dh-virtualenv-1.1/
+ env DEBIAN_FRONTEND=noninteractive mk-build-deps -ri -t "apt-get -yqq --no-install-recommends -o Dpkg::Options::=--force-unsafe-io"
+ dpkg-buildpackage -us -uc -b
+ cd /tmp/dhvenv
+ apt-get install -yqq ./dh-virtualenv_1.1-1_all.deb
+fi
+
+
+# we get a read-only copy of the source: make a writeable copy
+cp -aT /synapse/source /synapse/build
+cd /synapse/build
+
+# add an entry to the changelog for this distribution
+dch -M -l "+$DIST" "build for $DIST"
+dch -M -r "" --force-distribution --distribution "$DIST"
+
+dpkg-buildpackage -us -uc
+
+ls -l ..
+
+# copy the build results out, setting perms if necessary
+shopt -s nullglob
+for i in ../*.deb ../*.dsc ../*.tar.xz ../*.changes ../*.buildinfo; do
+ [ -z "$TARGET_USERID" ] || chown "$TARGET_USERID" "$i"
+ [ -z "$TARGET_GROUPID" ] || chgrp "$TARGET_GROUPID" "$i"
+ mv "$i" /debs
+done
diff --git a/docker/build_debian_packages.sh b/docker/build_debian_packages.sh
new file mode 100755
index 0000000000..eafed4ac41
--- /dev/null
+++ b/docker/build_debian_packages.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Build the Debian packages using Docker images.
+#
+# This script builds the Docker images and then executes them sequentially, each
+# one building a Debian package for the targeted operating system. It is
+# designed to be a "single command" to produce all the images.
+#
+# By default, builds for all known distributions, but a list of distributions
+# can be passed on the commandline for debugging.
+
+set -ex
+
+cd `dirname $0`
+
+if [ $# -lt 1 ]; then
+ DISTS=(debian:stretch debian:sid ubuntu:xenial ubuntu:bionic ubuntu:cosmic)
+else
+ DISTS=("$@")
+fi
+
+# Make the dir where the debs will live.
+#
+# Note that we deliberately put this outside the source tree, otherwise we tend
+# to get source packages which are full of debs. (We could hack around that
+# with more magic in the build_debian.sh script, but that doesn't solve the
+# problem for natively-run dpkg-buildpakage).
+
+mkdir -p ../../debs
+
+# Build each OS image;
+for i in "${DISTS[@]}"; do
+ TAG=$(echo ${i} | cut -d ":" -f 2)
+ docker build --tag dh-venv-builder:${TAG} --build-arg distro=${i} -f Dockerfile-dhvirtualenv .
+ docker run -it --rm --volume=$(pwd)/../\:/synapse/source:ro --volume=$(pwd)/../../debs:/debs \
+ -e TARGET_USERID=$(id -u) \
+ -e TARGET_GROUPID=$(id -g) \
+ dh-venv-builder:${TAG}
+done
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 92422c6ffc..96cd154234 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -78,7 +78,7 @@ CONDITIONAL_REQUIREMENTS = {
},
"postgres": {
"psycopg2>=2.6": ["psycopg2"]
- }
+ },
}
diff --git a/synapse/storage/e2e_room_keys.py b/synapse/storage/e2e_room_keys.py
index 16b7f005aa..45cebe61d1 100644
--- a/synapse/storage/e2e_room_keys.py
+++ b/synapse/storage/e2e_room_keys.py
@@ -182,7 +182,7 @@ class EndToEndRoomKeyStore(SQLBaseStore):
keyvalues = {
"user_id": user_id,
- "version": version,
+ "version": int(version),
}
if room_id:
keyvalues['room_id'] = room_id
diff --git a/tox.ini b/tox.ini
index 731094b5da..44371f211f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -119,6 +119,7 @@ setenv =
[testenv:packaging]
+skip_install=True
deps =
check-manifest
commands =
From 8957a11979dd25687a075eb4c94d9925da4701c8 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 20 Dec 2018 12:06:31 +0000
Subject: [PATCH 06/12] Update log config for debian packages
Better follow our own release notes.
---
debian/log.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/log.yaml b/debian/log.yaml
index b44a8901f6..206b65f1ac 100644
--- a/debian/log.yaml
+++ b/debian/log.yaml
@@ -18,6 +18,7 @@ handlers:
maxBytes: 104857600
backupCount: 10
filters: [context]
+ encoding: utf8
console:
class: logging.StreamHandler
formatter: precise
From 6dd72712436c9a0843c4a3ad197adfa4ecb8bffa Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 20 Dec 2018 12:07:15 +0000
Subject: [PATCH 07/12] Prepare 0.34 release
---
CHANGES.md | 27 +++++++++------------------
UPGRADE.rst | 9 ++++++++-
changelog.d/4212.misc | 1 -
changelog.d/4284.bugfix | 1 -
changelog.d/4294.bugfix | 1 -
changelog.d/4295.bugfix | 1 -
synapse/__init__.py | 2 +-
7 files changed, 18 insertions(+), 24 deletions(-)
delete mode 100644 changelog.d/4212.misc
delete mode 100644 changelog.d/4284.bugfix
delete mode 100644 changelog.d/4294.bugfix
delete mode 100644 changelog.d/4295.bugfix
diff --git a/CHANGES.md b/CHANGES.md
index 68210a7d60..a8744fb3d8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,21 +1,5 @@
-Synapse 0.34.0rc2 (2018-12-11)
-==============================
-
-Features
---------
-
-- Add a welcome page for the client API port. Credit to @krombel! ([\#4289](https://github.com/matrix-org/synapse/issues/4289))
-- Remove Matrix console from the default distribution ([\#4290](https://github.com/matrix-org/synapse/issues/4290))
-
-
-Internal Changes
-----------------
-
-- Disable pager when running git-show in CI ([\#4291](https://github.com/matrix-org/synapse/issues/4291))
-
-
-Synapse 0.34.0rc1 (2018-12-04)
-==============================
+Synapse 0.34.0 (2018-12-20)
+===========================
Synapse 0.34 is the first release to fully support Python 3. We recommend
upgrading to Python 3, but make sure to read the
@@ -24,6 +8,11 @@ upgrading to Python 3, but make sure to read the
Features
--------
+- Add 'sandbox' to CSP for media reprository ([\#4284](https://github.com/matrix-org/synapse/issues/4284))
+- Make the new landing page prettier. ([\#4294](https://github.com/matrix-org/synapse/issues/4294))
+- Fix deleting E2E room keys when using old SQLite versions. ([\#4295](https://github.com/matrix-org/synapse/issues/4295))
+- Add a welcome page for the client API port. Credit to @krombel! ([\#4289](https://github.com/matrix-org/synapse/issues/4289))
+- Remove Matrix console from the default distribution ([\#4290](https://github.com/matrix-org/synapse/issues/4290))
- Add option to track MAU stats (but not limit people) ([\#3830](https://github.com/matrix-org/synapse/issues/3830))
- Add an option to enable recording IPs for appservice users ([\#3831](https://github.com/matrix-org/synapse/issues/3831))
- Rename login type m.login.cas to m.login.sso ([\#4220](https://github.com/matrix-org/synapse/issues/4220))
@@ -49,6 +38,8 @@ Bugfixes
Internal Changes
----------------
+- Debian packages utilising a virtualenv with bundled dependencies can now be built. ([\#4212](https://github.com/matrix-org/synapse/issues/4212))
+- Disable pager when running git-show in CI ([\#4291](https://github.com/matrix-org/synapse/issues/4291))
- A coveragerc file, as well as the py36-coverage tox target, have been added. ([\#4180](https://github.com/matrix-org/synapse/issues/4180))
- Add a GitHub pull request template and add multiple issue templates ([\#4182](https://github.com/matrix-org/synapse/issues/4182))
- Update README to reflect the fact that #1491 is fixed ([\#4188](https://github.com/matrix-org/synapse/issues/4188))
diff --git a/UPGRADE.rst b/UPGRADE.rst
index 95f4e33300..b431850863 100644
--- a/UPGRADE.rst
+++ b/UPGRADE.rst
@@ -68,7 +68,7 @@ Upgrading to v0.34.0
synctl start
Users who have installed from distribution packages should see the relevant
- package documentation.
+ package documentation. See below for notes on Debian packages.
* When upgrading to Python 3, you **must** make sure that your log files are
configured as UTF-8, by adding ``encoding: utf8`` to the
@@ -107,6 +107,13 @@ Upgrading to v0.34.0
There is no need to revert this change if downgrading to Python 2.
+ * We are also making available Debian packages which will run Synapse on
+ Python 3. You can switch to these packages with ``apt-get install
+ matrix-synapse-py3``, however, please read
+ [debian/NEWS](https://github.com/matrix-org/synapse/blob/release-v0.34.0/debian/NEWS)
+ before doing so. The existing ``matrix-synapse`` packages will continue to
+ use Python 2 for the time being.
+
2. This release removes the ``riot.im`` from the default list of trusted
identity servers.
diff --git a/changelog.d/4212.misc b/changelog.d/4212.misc
deleted file mode 100644
index 42f2546cf9..0000000000
--- a/changelog.d/4212.misc
+++ /dev/null
@@ -1 +0,0 @@
-Debian packages utilising a virtualenv with bundled dependencies can now be built.
diff --git a/changelog.d/4284.bugfix b/changelog.d/4284.bugfix
deleted file mode 100644
index 4a9478fa28..0000000000
--- a/changelog.d/4284.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Add 'sandbox' to CSP for media reprository
diff --git a/changelog.d/4294.bugfix b/changelog.d/4294.bugfix
deleted file mode 100644
index 98114869fc..0000000000
--- a/changelog.d/4294.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Make the new landing page prettier.
diff --git a/changelog.d/4295.bugfix b/changelog.d/4295.bugfix
deleted file mode 100644
index e1603cbcda..0000000000
--- a/changelog.d/4295.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix deleting E2E room keys when using old SQLite versions.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index d5f6dc2094..27241cb364 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
except ImportError:
pass
-__version__ = "0.34.0rc2"
+__version__ = "0.34.0"
From 8e4d9122b0325a5c5d9df0b40df25e895132e9a2 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 20 Dec 2018 12:09:16 +0000
Subject: [PATCH 08/12] fix UPGRADE formatting
---
UPGRADE.rst | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/UPGRADE.rst b/UPGRADE.rst
index b431850863..b8dead480a 100644
--- a/UPGRADE.rst
+++ b/UPGRADE.rst
@@ -107,12 +107,12 @@ Upgrading to v0.34.0
There is no need to revert this change if downgrading to Python 2.
- * We are also making available Debian packages which will run Synapse on
- Python 3. You can switch to these packages with ``apt-get install
- matrix-synapse-py3``, however, please read
- [debian/NEWS](https://github.com/matrix-org/synapse/blob/release-v0.34.0/debian/NEWS)
- before doing so. The existing ``matrix-synapse`` packages will continue to
- use Python 2 for the time being.
+ We are also making available Debian packages which will run Synapse on
+ Python 3. You can switch to these packages with ``apt-get install
+ matrix-synapse-py3``, however, please read `debian/NEWS
+ <https://github.com/matrix-org/synapse/blob/release-v0.34.0/debian/NEWS>`_
+ before doing so. The existing ``matrix-synapse`` packages will continue to
+ use Python 2 for the time being.
2. This release removes the ``riot.im`` from the default list of trusted
identity servers.
From a92d55d8a713dadc2d3fca2a99f26a63da54cb71 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 20 Dec 2018 12:16:04 +0000
Subject: [PATCH 09/12] minor changelog tweaks
---
CHANGES.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index a8744fb3d8..14b2f1617f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,7 +15,7 @@ Features
- Remove Matrix console from the default distribution ([\#4290](https://github.com/matrix-org/synapse/issues/4290))
- Add option to track MAU stats (but not limit people) ([\#3830](https://github.com/matrix-org/synapse/issues/3830))
- Add an option to enable recording IPs for appservice users ([\#3831](https://github.com/matrix-org/synapse/issues/3831))
-- Rename login type m.login.cas to m.login.sso ([\#4220](https://github.com/matrix-org/synapse/issues/4220))
+- Rename login type `m.login.cas` to `m.login.sso` ([\#4220](https://github.com/matrix-org/synapse/issues/4220))
- Add an option to disable search for homeservers that may not be interested in it. ([\#4230](https://github.com/matrix-org/synapse/issues/4230))
@@ -40,15 +40,15 @@ Internal Changes
- Debian packages utilising a virtualenv with bundled dependencies can now be built. ([\#4212](https://github.com/matrix-org/synapse/issues/4212))
- Disable pager when running git-show in CI ([\#4291](https://github.com/matrix-org/synapse/issues/4291))
-- A coveragerc file, as well as the py36-coverage tox target, have been added. ([\#4180](https://github.com/matrix-org/synapse/issues/4180))
+- A coveragerc file has been added. ([\#4180](https://github.com/matrix-org/synapse/issues/4180))
- Add a GitHub pull request template and add multiple issue templates ([\#4182](https://github.com/matrix-org/synapse/issues/4182))
-- Update README to reflect the fact that #1491 is fixed ([\#4188](https://github.com/matrix-org/synapse/issues/4188))
+- Update README to reflect the fact that [\#1491](https://github.com/matrix-org/synapse/issues/1491) is fixed ([\#4188](https://github.com/matrix-org/synapse/issues/4188))
- Run the AS senders as background processes to fix warnings ([\#4189](https://github.com/matrix-org/synapse/issues/4189))
- Add some diagnostics to the tests to detect logcontext problems ([\#4190](https://github.com/matrix-org/synapse/issues/4190))
- Add missing `jpeg` package prerequisite for OpenBSD in README. ([\#4193](https://github.com/matrix-org/synapse/issues/4193))
- Add a note saying you need to manually reclaim disk space after using the Purge History API ([\#4200](https://github.com/matrix-org/synapse/issues/4200))
- More logcontext checking in unittests ([\#4205](https://github.com/matrix-org/synapse/issues/4205))
-- Ignore __pycache__ directories in the database schema folder ([\#4214](https://github.com/matrix-org/synapse/issues/4214))
+- Ignore `__pycache__` directories in the database schema folder ([\#4214](https://github.com/matrix-org/synapse/issues/4214))
- Add note to UPGRADE.rst about removing riot.im from list of trusted identity servers ([\#4224](https://github.com/matrix-org/synapse/issues/4224))
- Added automated coverage reporting to CI. ([\#4225](https://github.com/matrix-org/synapse/issues/4225))
- Garbage-collect after each unit test to fix logcontext leaks ([\#4227](https://github.com/matrix-org/synapse/issues/4227))
From 0e8acf3b027717aae88a9f16c1c82c4892750122 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 20 Dec 2018 12:18:03 +0000
Subject: [PATCH 10/12] more changelog fix
---
CHANGES.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index 14b2f1617f..f1332edf94 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,7 +1,7 @@
Synapse 0.34.0 (2018-12-20)
===========================
-Synapse 0.34 is the first release to fully support Python 3. We recommend
+Synapse 0.34.0 is the first release to fully support Python 3. We recommend
upgrading to Python 3, but make sure to read the
[upgrade notes](UPGRADE.rst#upgrading-to-v0340) when doing so.
From dfeb274484323403cfac8c9bc7026130a298f30e Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 20 Dec 2018 13:57:48 +0000
Subject: [PATCH 11/12] document supported python 3 versions
---
CHANGES.md | 9 ++++++---
UPGRADE.rst | 5 +++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index f1332edf94..727275fa33 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,12 @@
Synapse 0.34.0 (2018-12-20)
===========================
-Synapse 0.34.0 is the first release to fully support Python 3. We recommend
-upgrading to Python 3, but make sure to read the
-[upgrade notes](UPGRADE.rst#upgrading-to-v0340) when doing so.
+Synapse 0.34.0 is the first release to fully support Python 3. Synapse will now
+run on Python versions 3.5 or 3.6 (as well as 2.7). Support for Python 3.7
+remains experimental.
+
+We recommend upgrading to Python 3, but make sure to read the [upgrade
+notes](UPGRADE.rst#upgrading-to-v0340) when doing so.
Features
--------
diff --git a/UPGRADE.rst b/UPGRADE.rst
index b8dead480a..b214a15526 100644
--- a/UPGRADE.rst
+++ b/UPGRADE.rst
@@ -51,8 +51,9 @@ returned by the Client-Server API:
Upgrading to v0.34.0
====================
-1. This release is the first to fully support Python 3. We recommend switching
- to Python 3, as it has been shown to give performance improvements.
+1. This release is the first to fully support Python 3. Synapse will now run on
+ Python versions 3.5, or 3.6 (as well as 2.7). We recommend switching to
+ Python 3, as it has been shown to give performance improvements.
For users who have installed Synapse into a virtualenv, we recommend doing
this by creating a new virtualenv. For example::
From d731b75c7bcada708f1acbb83e2521da6a7d97a9 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 20 Dec 2018 14:55:41 +0000
Subject: [PATCH 12/12] Clarify that py2 packages will continue to exist
---
debian/NEWS | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/debian/NEWS b/debian/NEWS
index 367e08f851..8f0d9d0acf 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -19,4 +19,8 @@ matrix-synapse-py3 (0.34.0) stable; urgency=medium
though that service is no longer being provided by the matrix-synapse
package. It can be re-enabled with `systemctl enable matrix-synapse`.
+ The matrix.org team will continue to provide Python 2 `matrix-synapse`
+ packages for the next couple of releases, to allow time for system
+ administrators to test the new packages.
+
-- Richard van der Hoff <richard@matrix.org> Wed, 19 Dec 2018 14:00:00 +0000