From c734163ed7d05658cbaa31b3d28d3d0e85540486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Thu, 1 Aug 2019 15:32:59 +0200
Subject: [PATCH] Fix check starting service

---
 scripts/change_url | 3 ++-
 scripts/install    | 5 +++--
 scripts/restore    | 3 ++-
 scripts/upgrade    | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/scripts/change_url b/scripts/change_url
index 87eea15..6486964 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -26,6 +26,7 @@ dbpass=$(ynh_app_setting_get "$app" mysqlpwd)
 admin=$(ynh_app_setting_get "$app" adminusername)
 key=$(ynh_app_setting_get "$app" secret_key)
 port=$(ynh_app_setting_get "$app" web_port)
+upstream_version=$(ynh_app_setting_get $app upstream_version)
 
 #=================================================
 # STANDARD MODIFICATIONS
@@ -50,7 +51,7 @@ config_nginx
 config_gitea
 
 # RELOAD services
-ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "systemd" -a restart
+ynh_systemd_action -l "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -a restart -t 5
 sleep 1
 
 # Store the checksum with the 'INTERNAL_TOKEN' value.
diff --git a/scripts/install b/scripts/install
index 40deb45..3e6d8f1 100644
--- a/scripts/install
+++ b/scripts/install
@@ -19,6 +19,7 @@ domain=$YNH_APP_ARG_DOMAIN
 path_url=$(ynh_normalize_url_path $YNH_APP_ARG_PATH)
 admin=$YNH_APP_ARG_ADMIN
 is_public=$YNH_APP_ARG_IS_PUBLIC
+upstream_version=$(ynh_app_upstream_version)
 
 # Check domain/path availability
 ynh_webpath_available $domain $path_url || ynh_die "$domain is not available as domain, please use an other domain."
@@ -113,10 +114,10 @@ yunohost service add "$app" --log "/var/log/$app/$app.log"
 ynh_use_logrotate "/var/log/$app"
 
 # Save Version
-ynh_app_setting_set $app upstream_version $(ynh_app_upstream_version)
+ynh_app_setting_set $app upstream_version $upstream_version
 
 # Reload services
-ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "systemd"
+ynh_systemd_action -l "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -t 5
 sleep 1
 
 # Store the checksum with the 'INTERNAL_TOKEN' value.
diff --git a/scripts/restore b/scripts/restore
index c13cf0d..8abb1d1 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -20,6 +20,7 @@ path_url=$(ynh_app_setting_get "$app" path)
 dbpass=$(ynh_app_setting_get "$app" mysqlpwd)
 admin=$(ynh_app_setting_get "$app" adminusername)
 port=$(ynh_app_setting_get "$app" web_port)
+upstream_version=$(ynh_app_setting_get $app upstream_version)
 
 # Check domain/path availability with app helper
 ynh_webpath_available $domain $path_url || ynh_die "$domain is not available as domain, please use an other domain."
@@ -69,5 +70,5 @@ yunohost service add "$app" --log /var/log/"$app"/"$app".log
 
 # Reload services
 systemctl reload nginx.service
-ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "systemd"
+ynh_systemd_action -l "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -t 5
 sleep 1
diff --git a/scripts/upgrade b/scripts/upgrade
index 71cd1df..07ec290 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -178,7 +178,7 @@ ynh_app_setting_set $app upstream_version $(ynh_app_upstream_version)
 set_access_settings
 
 # Reload services
-ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "systemd"
+ynh_systemd_action -l "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -t 5
 sleep 1
 
 # Store the checksum with the 'INTERNAL_TOKEN' value.