From 09f23b5a08af4a7af975ae5a393eff5778e19987 Mon Sep 17 00:00:00 2001
From: Julien VAUBOURG <julien@vaubourg.com>
Date: Fri, 24 Jul 2015 19:44:34 +0200
Subject: [PATCH] Improve upgrade script

---
 scripts/install | 6 +++---
 scripts/remove  | 1 +
 scripts/upgrade | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index 3f9ed22..bb4c221 100644
--- a/scripts/install
+++ b/scripts/install
@@ -123,13 +123,11 @@ sudo systemctl restart php5-fpm
 sudo systemctl reload nginx
 
 sudo systemctl enable ynh-vpnclient
+sudo yunohost service add ynh-vpnclient
 
 if ! $upgrade; then
   sudo systemctl start ynh-vpnclient
 
-  sudo yunohost service add ynh-vpnclient
-  sudo yunohost app ssowatconf
-
   # Check configuration consistency
   
   if [ -z "${crt_server_ca_path}" ]; then
@@ -141,4 +139,6 @@ if ! $upgrade; then
   fi
 fi
 
+sudo yunohost app ssowatconf
+
 exit 0
diff --git a/scripts/remove b/scripts/remove
index 59b636a..a912384 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -23,6 +23,7 @@ domain=$(sudo yunohost app setting vpnclient domain)
 # The End
 sudo systemctl stop ynh-vpnclient
 sudo systemctl disable ynh-vpnclient
+sudo yunohost service remove ynh-vpnclient
 sudo rm -f /etc/systemd/system/ynh-vpnclient.service /usr/local/bin/ynh-vpnclient
 sudo rm -f /tmp/.ynh-vpnclient-*
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 1e83b87..055ca7a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -12,7 +12,6 @@ path=$(ynh_setting vpnclient path)
 server_name=$(ynh_setting vpnclient server_name)
 
 tmpdir=$(mktemp -dp /tmp/ vpnclient-upgrade-XXXXX)
-sudo systemctl stop ynh-vpnclient
 sudo cp -a /etc/openvpn/keys/ "${tmpdir}/"
 
 export VPNCLIENT_UPGRADE=1