From 4082157e1460185a6db51ed4250da5972964f1a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Sat, 28 Nov 2020 19:24:23 +0100
Subject: [PATCH] Update uwsgi helper

---
 scripts/experimental_helper.sh | 28 ++++++++++++++--------------
 scripts/restore                |  3 +++
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/scripts/experimental_helper.sh b/scripts/experimental_helper.sh
index 0e70509..8aadcff 100644
--- a/scripts/experimental_helper.sh
+++ b/scripts/experimental_helper.sh
@@ -6,28 +6,25 @@
 #
 # usage: ynh_check_global_uwsgi_config
 ynh_check_global_uwsgi_config () {
-    uwsgi --version || ynh_die --message "You need to add uwsgi (and appropriate plugin) as a dependency"
+    uwsgi --version || ynh_die --message="You need to add uwsgi (and appropriate plugin) as a dependency"
 
     cat > /etc/systemd/system/uwsgi-app@.service <<EOF
 [Unit]
 Description=%i uWSGI app
 After=syslog.target
-
 [Service]
 RuntimeDirectory=%i
 ExecStart=/usr/bin/uwsgi \
         --ini /etc/uwsgi/apps-available/%i.ini \
-        --socket /run/%i/app.socket \
+        --socket /var/run/%i/app.socket \
         --logto /var/log/uwsgi/%i/%i.log
 User=%i
 Group=www-data
-Restart=always
-RestartSec=10
+Restart=on-failure
 KillSignal=SIGQUIT
 Type=notify
 StandardError=syslog
 NotifyAccess=all
-
 [Install]
 WantedBy=multi-user.target
 EOF
@@ -63,21 +60,21 @@ ynh_add_uwsgi_service () {
     local finaluwsgiini="/etc/uwsgi/apps-available/$app.ini"
 
     # www-data group is needed since it is this nginx who will start the service
-    usermod --append --groups www-data "$app" || ynh_die --message "It wasn't possible to add user $app to group www-data"
+    usermod --append --groups www-data "$app" || ynh_die --message="It wasn't possible to add user $app to group www-data"
 
-    ynh_backup_if_checksum_is_different "$finaluwsgiini"
+    ynh_backup_if_checksum_is_different --file="$finaluwsgiini"
     cp ../conf/uwsgi.ini "$finaluwsgiini"
 
     # To avoid a break by set -u, use a void substitution ${var:-}. If the variable is not set, it's simply set with an empty variable.
     # Substitute in a nginx config file only if the variable is not empty
     if test -n "${final_path:-}"; then
-        ynh_replace_string --match_string "__FINALPATH__" --replace_string "$final_path" --target_file "$finaluwsgiini"
+        ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="$finaluwsgiini"
     fi
     if test -n "${path_url:-}"; then
-        ynh_replace_string --match_string "__PATH__" --replace_string "$path_url" --target_file "$finaluwsgiini"
+        ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="$finaluwsgiini"
     fi
     if test -n "${app:-}"; then
-        ynh_replace_string --match_string "__APP__" --replace_string "$app" --target_file "$finaluwsgiini"
+        ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="$finaluwsgiini"
     fi
 
     # Replace all other variable given as arguments
@@ -85,10 +82,10 @@ ynh_add_uwsgi_service () {
     do
         # ${var_to_replace^^} make the content of the variable on upper-cases
         # ${!var_to_replace} get the content of the variable named $var_to_replace 
-        ynh_replace_string --match_string "__${var_to_replace^^}__" --replace_string "${!var_to_replace}" --target_file "$finaluwsgiini"
+        ynh_replace_string --match_string="__${var_to_replace^^}__" --replace_string="${!var_to_replace}" --target_file="$finaluwsgiini"
     done
 
-    ynh_store_file_checksum --file "$finaluwsgiini"
+    ynh_store_file_checksum --file="$finaluwsgiini"
 
     chown $app:root "$finaluwsgiini"
 
@@ -103,7 +100,9 @@ ynh_add_uwsgi_service () {
         cp ../conf/uwsgi-app@override.service /etc/systemd/system/uwsgi-app@$app.service.d/override.conf
 
     systemctl daemon-reload
+    systemctl stop "uwsgi-app@$app.service" || true
     systemctl enable "uwsgi-app@$app.service"
+    systemctl start "uwsgi-app@$app.service"
 
     # Add as a service
     yunohost service add "uwsgi-app@$app" --log "/var/log/uwsgi/$app/$app.log"
@@ -115,8 +114,9 @@ ynh_add_uwsgi_service () {
 ynh_remove_uwsgi_service () {
     local finaluwsgiini="/etc/uwsgi/apps-available/$app.ini"
     if [ -e "$finaluwsgiini" ]; then
-        systemctl disable "uwsgi-app@$app.service"
         yunohost service remove "uwsgi-app@$app"
+        systemctl stop "uwsgi-app@$app.service"
+        systemctl disable "uwsgi-app@$app.service"
 
         ynh_secure_remove --file="$finaluwsgiini"
         ynh_secure_remove --file="/var/log/uwsgi/$app"
diff --git a/scripts/restore b/scripts/restore
index b3db386..b74e266 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -23,6 +23,9 @@ final_path=$(ynh_app_setting_get --app $app --key final_path)
 db_name=$(ynh_app_setting_get --app $app --key db_name)
 db_user=$(ynh_app_setting_get --app $app --key db_user)
 db_pwd=$(ynh_app_setting_get --app $app --key db_pwd)
+app_version=$(ynh_app_upstream_version)
+app_main_version=$(echo $app_version | cut -d'-' -f1)
+app_sub_version=$(echo $app_version | cut -d'-' -f2)
 
 #=================================================
 # STANDARD RESTORATION STEPS