WEBLIB.RE/vpnclient_ynh
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Stop timer when removing

Browse Source
This commit is contained in:
Julien Vaubourg 2016-08-14 22:13:41 +02:00
parent 43d44616fa
commit d6b7958064
No known key found for this signature in database
GPG Key ID: 46D5C2DE01BFEE71
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/remove
View File

@ -21,7 +21,8 @@
domain=$(sudo yunohost app setting vpnclient domain) domain=$(sudo yunohost app setting vpnclient domain)
# The End # 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 stop ynh-vpnclient
sudo systemctl disable ynh-vpnclient sudo systemctl disable ynh-vpnclient
sudo yunohost service remove ynh-vpnclient sudo yunohost service remove ynh-vpnclient

16
scripts/upgrade
View File

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