Merge pull request #54 from keomabrun/dev_53

fix #53
2019-02-26 21:12:33 +01:00
parent b1c667817b 5c90da1a79
commit 73aa672346
2 changed files with 12 additions and 2 deletions
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -212,3 +212,7 @@ function vpnclient_deploy_files_and_services()
  # Reload systemd configuration
  systemctl daemon-reload
 }
+
+function service_is_managed_by_yunohost() {
+  yunohost service status $1 >/dev/null 2>&1
+}
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -93,12 +93,18 @@ systemctl reload nginx

 # main service

-yunohost service remove $service_name
+if service_is_managed_by_yunohost $service_name
+then
+  yunohost service remove $service_name
+fi
 yunohost service add $service_name --description "tunnels the internet traffic through a VPN" --need_lock

 # checker service

-yunohost service remove $service_checker_name
+if service_is_managed_by_yunohost $service_checker_name
+then
+  yunohost service remove $service_checker_name
+fi
 yunohost service add $service_checker_name --description "makes sure that the VPN service is running" --need_lock

 # Reload systemd configuration