Stop timer when removing

scripts/remove

@@ -21,7 +21,8 @@
 domain=$(sudo yunohost app setting vpnclient domain)
 
 # The End
-sudo systemctl disable ynh-vpnclient-checker.timer && sleep 1
+sudo systemctl stop ynh-vpnclient-checker.timer && sleep 1
+sudo systemctl disable ynh-vpnclient-checker.timer
 sudo systemctl stop ynh-vpnclient
 sudo systemctl disable ynh-vpnclient
 sudo yunohost service remove ynh-vpnclient

scripts/upgrade

@@ -15,23 +15,23 @@ path=$(ynh_setting vpnclient path)
 server_name=$(ynh_setting vpnclient server_name)
 
 sudo mkdir -m 0700 -p "${cachedir}/vpnclient/"
-backupdir=$(sudo mktemp -dp ${cachedir}/vpnclient/ upgrade_$(date +%Y-%m-%d-%H%M%S)_XXXXX)
+rollbackdir=$(sudo mktemp -dp ${cachedir}/vpnclient/ rollback_$(date +%Y-%m-%d-%H%M%S)_XXXXX)
 
-sudo tar czf "${backupdir}/etc_openvpn.tgz" /etc/openvpn/
-sudo cp -a /etc/yunohost/apps/vpnclient/settings.yml "${backupdir}/"
-sudo cp -a /etc/openvpn/keys/ "${backupdir}/"
+sudo tar czf "${rollbackdir}/etc_openvpn.tgz" /etc/openvpn/
+sudo cp -a /etc/yunohost/apps/vpnclient/settings.yml "${rollbackdir}/"
+sudo cp -a /etc/openvpn/keys/ "${rollbackdir}/"
 
 if [ ! -e /etc/openvpn/client.conf.tpl.restore ] || ! cmp -s /etc/openvpn/client.conf.tpl{,.restore}; then
-  sudo cp -a /etc/openvpn/client.conf.tpl "${backupdir}/"
+  sudo cp -a /etc/openvpn/client.conf.tpl "${rollbackdir}/"
 fi
 
 export VPNCLIENT_UPGRADE=1
 sudo bash /etc/yunohost/apps/vpnclient/scripts/remove &> /dev/null
 bash ./install "${domain}" "${path}" "${server_name}"
 
-sudo cp -a "${backupdir}/settings.yml" /etc/yunohost/apps/vpnclient/
-sudo cp -a ${backupdir}/keys/* /etc/openvpn/keys/ 2> /dev/null
-sudo cp -a "${backupdir}/client.conf.tpl" /etc/openvpn/ 2> /dev/null
+sudo cp -a "${rollbackdir}/settings.yml" /etc/yunohost/apps/vpnclient/
+sudo cp -a "${rollbackdir}/keys/"* /etc/openvpn/keys/
+sudo cp -a "${rollbackdir}/client.conf.tpl" /etc/openvpn/ 2> /dev/null
 
 # Changes