From da655023c94ee89b81661a600616342556f75361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Sat, 11 Apr 2020 11:20:55 +0200
Subject: [PATCH 1/3] Use helper to restore systemd unit

---
 scripts/backup  | 1 -
 scripts/restore | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/backup b/scripts/backup
index 661d0ae..ccb21f8 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -43,6 +43,5 @@ ynh_backup --src_path "/var/log/uwsgi/$app"
 # BACKUP THE UWSGI FILES
 ynh_script_progression --message="Backing up configuration..."
 ynh_backup --src_path "/etc/uwsgi/apps-available/$app.ini"
-ynh_backup --src_path "/etc/systemd/system/uwsgi-app@.service"
 
 ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last
diff --git a/scripts/restore b/scripts/restore
index d36d85c..d21cc53 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -56,7 +56,7 @@ yunohost service add "uwsgi-app@$app.service" --log "/var/log/uwsgi/app/$app"
 
 ynh_script_progression --message="Reloading services..." --weight=3
 
-systemctl daemon-reload
+ynh_check_global_uwsgi_config
 systemctl enable "uwsgi-app@$app.service"
 
 # RELOAD NGINX AND UWSGI

From 687f32855c97059cd324c33e9a546ea45cbc0179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Tue, 21 Apr 2020 20:53:29 +0200
Subject: [PATCH 2/3] Revert "Update to commmit 33a1e42"

This reverts commit 0d2eb0626231e2f78a0c1002a4ce140c1c41fec9.
---
 README.md    | 4 +---
 conf/app.src | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index f2c1d3b..29b7d53 100644
--- a/README.md
+++ b/README.md
@@ -14,9 +14,7 @@ The Sync Server provides a replacement for Firefox’s default server (hosted at
 
 By default, a server set up will defer authentication to the Mozilla-hosted accounts server at [https://accounts.firefox.com](https://accounts.firefox.com). So you will still have to authenticate at Mozilla, but _the storage of your information will be done on your host_.
 
-Since no version was released since 2018, we follow now the master branch
-
-**Shipped version:** commit 33a1e42
+**Shipped version:** 1.8
 
 Documentation
 -------------
diff --git a/conf/app.src b/conf/app.src
index cc235f6..28519e2 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,4 +1,4 @@
-SOURCE_URL=https://github.com/mozilla-services/syncserver/archive/33a1e42c14dd1bd54ac2440001c81d23b7ae6d73.zip
-SOURCE_SUM=345fe53e9f949df52fe8233cf7f74eff2818942f6a9d6fda9657d888ca5ec99d
+SOURCE_URL=https://github.com/mozilla-services/syncserver/archive/1.8.0.tar.gz
+SOURCE_SUM=728206bcffec7a305e97e7cd4d465b3fa56f39f8e1fd55d98e49a866016d61e0
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=zip
+SOURCE_FORMAT=tar.gz

From 179c8bb44f6aaaf58b1c99ebaac731a51dd5b31f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Tue, 21 Apr 2020 20:55:12 +0200
Subject: [PATCH 3/3] Fix soupsieve dependance

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 08c2ffb..1ba36db 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -19,7 +19,7 @@ install_sources() {
         set -o nounset
         cd "$final_path"
         pip install --upgrade pip
-        pip install --upgrade pyramid_chameleon
+        pip install --upgrade pyramid_chameleon 'soupsieve<2.0'
         CFLAGS="-Wno-error -Wno-error=format-security" \
             ARCHFLAGS="-Wno-error=unused-command-line-argument-hard-error-in-future" \
             pip install --upgrade --requirement "$final_path/requirements.txt"