From 0d9204ec9582f2ffb6a2766cf1544a7540178673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Fri, 8 Feb 2019 14:53:18 +0100
Subject: [PATCH] Use the pip source for synapse

---
 conf/python_source.src | 5 -----
 scripts/install        | 4 +---
 scripts/restore        | 2 +-
 scripts/upgrade        | 5 +----
 4 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 conf/python_source.src

diff --git a/conf/python_source.src b/conf/python_source.src
deleted file mode 100644
index f26f589..0000000
--- a/conf/python_source.src
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCE_URL=https://github.com/matrix-org/synapse/archive/v0.99.0.tar.gz
-SOURCE_SUM=63f6203757b48be38265c08b831a0640319b0b70bf1d06f7f95a65499ca00184
-SOURCE_FORMAT=tar.gz
-SOURCE_FILENAME=synapse_source.tar.gz
-SOURCE_EXTRACT=false
diff --git a/scripts/install b/scripts/install
index 40d22b5..7d30cc7 100644
--- a/scripts/install
+++ b/scripts/install
@@ -163,9 +163,7 @@ else
     pip3 install --upgrade pip
     pip3 install --upgrade setuptools wheel
     pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml
-
-    ynh_setup_source "/tmp" "python_source"
-    pip3 install --upgrade "/tmp/synapse_source.tar.gz"
+    pip3 install --upgrade matrix-synapse==$upstream_version matrix-synapse-ldap3
 
     # This function was defined when we called "source $final_path/bin/activate". With this function we undo what "$final_path/bin/activate" does
     deactivate
diff --git a/scripts/restore b/scripts/restore
index bc5cc56..7a8a49f 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -192,7 +192,7 @@ chown $synapse_user:root -R /var/lib/matrix-$app
 chown $synapse_user:root -R /var/log/matrix-$app
 chown $synapse_user:root -R /etc/matrix-$app
 chmod u=rwX,g=rX,o= -R /etc/matrix-$app
-chmod 600 /etc/matrix-$app/{$domain.signing.key,$domain.tls.crt,$domain.tls.dh,$domain.tls.key}
+chmod 600 /etc/matrix-$app/$domain.signing.key
 setfacl -R -m user:turnserver:rX  /etc/matrix-$app
 setfacl -R -m user:turnserver:rwX  /var/log/matrix-$app
 
diff --git a/scripts/upgrade b/scripts/upgrade
index a0e9740..0253fc5 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -109,10 +109,7 @@ else
     source $final_path/bin/activate
     pip3 install --upgrade setuptools wheel
     pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml
-
-    # Download and check the checksum for the synapse source
-    ynh_setup_source "/tmp" "python_source"
-    pip3 install --upgrade "/tmp/synapse_source.tar.gz"
+    pip3 install --upgrade matrix-synapse==$upstream_version matrix-synapse-ldap3
 
     # This function was defined when we called "source $final_path/bin/activate". With this function we undo what "$final_path/bin/activate" does
     deactivate