From 67d17653fb3b2fea12d69fd6365707babce09f26 Mon Sep 17 00:00:00 2001 From: Julien VAUBOURG Date: Sun, 26 Jul 2015 10:43:58 +0200 Subject: [PATCH] Save settings before upgrading --- scripts/restore | 2 +- scripts/upgrade | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 978f403..df2c470 100644 --- a/scripts/restore +++ b/scripts/restore @@ -13,7 +13,7 @@ git clone https://github.com/labriqueinternet/vpnclient_ynh.git "${tmpdir}/" git --work-tree "${tmpdir}/" --git-dir "${tmpdir}/.git/" reset --hard "${gitcommit}" cd "${tmpdir}/scripts/" -./upgrade +bash ./upgrade sudo rm -r "${tmpdir}/" diff --git a/scripts/upgrade b/scripts/upgrade index d2f7b2b..5b19d8c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,15 +12,21 @@ path=$(ynh_setting vpnclient path) server_name=$(ynh_setting vpnclient server_name) tmpdir=$(mktemp -dp /tmp/ vpnclient-upgrade-XXXXX) +sudo cp -a /etc/yunohost/apps/vpnclient/settings.yml "${tmpdir}/" sudo cp -a /etc/openvpn/keys/ "${tmpdir}/" export VPNCLIENT_UPGRADE=1 sudo bash /etc/yunohost/apps/vpnclient/scripts/remove &> /dev/null bash ./install "${domain}" "${path}" "${server_name}" +gitcommit=$(ynh_setting vpnclient gitcommit) + +sudo cp -a "${tmpdir}/settings.yml" /etc/yunohost/apps/vpnclient/ sudo cp -a "${tmpdir}/keys/"* /etc/openvpn/keys/ 2> /dev/null sudo rm -r "${tmpdir}/" +sudo yunohost app setting vpnclient gitcommit -v "${gitcommit}" + sudo systemctl start ynh-vpnclient exit 0