Merge branch 'testing' into fix-buster

README.md

@@ -12,9 +12,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
 
 ## Configuration
 

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

scripts/_common.sh

@@ -25,7 +25,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"

scripts/backup

@@ -59,6 +59,7 @@ ynh_backup --src_path="/var/log/uwsgi/$app"
 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"
+
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/restore

@@ -85,7 +85,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"
 
 #=================================================