From 6e8233b9b0e0a9b59a3eff132af08ce3efdc7fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Mon, 7 Dec 2020 16:29:43 +0100
Subject: [PATCH] Standardize start systemd action and update uwsgi helper

---
 scripts/_common.sh             |  2 +-
 scripts/change_url             |  5 ++---
 scripts/experimental_helper.sh | 14 +++++++++-----
 scripts/install                |  4 ++--
 scripts/restore                |  2 +-
 scripts/upgrade                |  4 ++--
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index a8abe47..59afd95 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,7 +4,7 @@
 
 app=$YNH_APP_INSTANCE_NAME
 final_path=/opt/yunohost/$app
-pgadmin_user="pgadmin"
+pgadmin_user="$app"
 python_version="$(python3 -V | cut -d' ' -f2 | cut -d. -f1-2)"
 dependances="python3-pip build-essential python3-dev python3-venv postgresql uwsgi uwsgi-plugin-python3 expect libpq-dev"
 
diff --git a/scripts/change_url b/scripts/change_url
index 424c73c..828f568 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -42,10 +42,9 @@ ynh_add_nginx_config
 ynh_add_uwsgi_service 'pgadmin_user python_version'
 
 # Reload services
-ynh_script_progression --message="Reloading services..."
-sudo systemctl reload nginx.service
+ynh_script_progression --message="Restarting $app services..." --weight=3
 ynh_systemd_action --service_name "uwsgi-app@$app.service" --action restart \
-    --line_match "WSGI app 0 \(mountpoint='$path_url'\) ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log"
+    --line_match "WSGI app 0 \(mountpoint='[/[:alnum:]_-]*'\) ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/$app.log"
 sleep 10
 
 ynh_script_progression --message="Change of URL completed for $app" --last
diff --git a/scripts/experimental_helper.sh b/scripts/experimental_helper.sh
index 8aadcff..3b75020 100644
--- a/scripts/experimental_helper.sh
+++ b/scripts/experimental_helper.sh
@@ -9,22 +9,24 @@ ynh_check_global_uwsgi_config () {
     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 /var/run/%i/app.socket \
+        --socket /run/%i/app.socket \
         --logto /var/log/uwsgi/%i/%i.log
 User=%i
 Group=www-data
-Restart=on-failure
+Restart=always
+RestartSec=10
 KillSignal=SIGQUIT
 Type=notify
 StandardError=syslog
 NotifyAccess=all
+
 [Install]
 WantedBy=multi-user.target
 EOF
@@ -49,6 +51,10 @@ EOF
 #
 # To be able to customise the settings of the systemd unit you can override the rules with the file "conf/uwsgi-app@override.service".
 # This file will be automatically placed on the good place
+# 
+# Note that the service need to be started manually at the end of the installation.
+# Generally you can start the service with this command:
+# ynh_systemd_action --service_name "uwsgi-app@$app.service" --line_match "WSGI app 0 \(mountpoint='[/[:alnum:]_-]*'\) ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/$app.log"
 #
 # usage: ynh_add_uwsgi_service
 #
@@ -100,9 +106,7 @@ 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"
diff --git a/scripts/install b/scripts/install
index 389b1d0..d9f0cc8 100644
--- a/scripts/install
+++ b/scripts/install
@@ -121,9 +121,9 @@ ynh_script_progression --message="Configuring log rotation..."
 ynh_use_logrotate --logfile /var/log/pgadmin
 
 # reload uwsgi
-ynh_script_progression --message="Starting pgadmin services..." --weight=3
+ynh_script_progression --message="Starting $app services..." --weight=3
 ynh_systemd_action --service_name "uwsgi-app@$app.service" \
-    --line_match "WSGI app 0 \(mountpoint='$path_url'\) ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log"
+    --line_match "WSGI app 0 \(mountpoint='[/[:alnum:]_-]*'\) ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/$app.log"
 sleep 10
 
 ynh_script_progression --message="Installation of $app completed" --last
diff --git a/scripts/restore b/scripts/restore
index b74e266..d9621c6 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -77,7 +77,7 @@ ynh_use_logrotate --logfile /var/log/pgadmin
 # reload uwsgi and nginx
 ynh_script_progression --message="Starting pgadmin services..." --weight=3
 ynh_systemd_action --service_name "uwsgi-app@$app.service" \
-    --line_match "WSGI app 0 \(mountpoint='$path_url'\) ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log"
+    --line_match "WSGI app 0 \(mountpoint='[/[:alnum:]_-]*'\) ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/$app.log"
 systemctl reload nginx
 sleep 10
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 98afbd0..5013c0d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -71,9 +71,9 @@ ynh_script_progression --message="Configuring log rotation..."
 ynh_use_logrotate --logfile /var/log/pgadmin --nonappend
 
 # reload uwsgi
-ynh_script_progression --message="Restarting pgadmin services..." --weight=3
+ynh_script_progression --message="Restarting $app services..." --weight=3
 ynh_systemd_action --service_name "uwsgi-app@$app.service" \
-    --line_match "WSGI app 0 \(mountpoint='$path_url'\) ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log"
+    --line_match "WSGI app 0 \(mountpoint='[/[:alnum:]_-]*'\) ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/$app.log"
 sleep 10
 
 ynh_script_progression --message="Upgrade of $app completed" --last