Ommit OpenVPN if not installed.

This commit is contained in:
root 2017-02-21 16:48:17 +01:00
parent 6c8a7a75ec
commit 10ad624fdd
3 changed files with 19 additions and 13 deletions

View File

@ -121,14 +121,16 @@ fi
# - OpenVPN: # - OpenVPN:
# - /etc/openvpn/* # - /etc/openvpn/*
# - # -
echo -en "\tVPN settings.." if [[ -d "/etc/openvpn" ]]; then
/etc/init.d/openvpn stop > /dev/null echo -en "\tVPN settings.."
rm -rf /etc/openvpn /etc/init.d/openvpn stop > /dev/null
cp -a ${base_dir}/${network}/openvpn /etc/openvpn rm -rf /etc/openvpn
if [ "$?" != "0" ]; then cp -a ${base_dir}/${network}/openvpn /etc/openvpn
echo_FAILED if [ "$?" != "0" ]; then
else echo_FAILED
echo_OK else
echo_OK
fi
fi fi
if [ -d "/root/.openvpn" ]; then if [ -d "/root/.openvpn" ]; then

View File

@ -70,8 +70,10 @@ chown ${user}:${user} ${homedir_user}/${_dir}/bind_${_network}.tar.gz
# - OpenVPN: # - OpenVPN:
# - /etc/openvpn/* # - /etc/openvpn/*
# - # -
tar -czpf ${homedir_user}/${_dir}/openvpn_${_network}.tar.gz -C ${filesystem_prefix}/etc openvpn if [[ -d "${filesystem_prefix}/etc/openvpn" ]]: then
chown ${user}:${user} ${homedir_user}/${_dir}/openvpn_${_network}.tar.gz tar -czpf ${homedir_user}/${_dir}/openvpn_${_network}.tar.gz -C ${filesystem_prefix}/etc openvpn
chown ${user}:${user} ${homedir_user}/${_dir}/openvpn_${_network}.tar.gz
fi
if [ -d "/root/.openvpn" ]; then if [ -d "/root/.openvpn" ]; then
tar -czpf ${homedir_user}/${_dir}/root-dot-opennvpndir_${_network}.tar.gz -C /root .openvpn tar -czpf ${homedir_user}/${_dir}/root-dot-opennvpndir_${_network}.tar.gz -C /root .openvpn

View File

@ -76,9 +76,11 @@ scp -o User=$remote_user ${remote_host}:${_network}-config/bind_${_network}.tar.
gunzip < bind_${_network}.tar.gz | tar -xpf - gunzip < bind_${_network}.tar.gz | tar -xpf -
rm -f bind_${_network}.tar.gz rm -f bind_${_network}.tar.gz
scp -o User=$remote_user ${remote_host}:${_network}-config/openvpn_${_network}.tar.gz . if ssh -l $remote_user ${remote_host} [ -f "${_network}-config/openvpn_${_network}.tar.gz" ]; then
gunzip < openvpn_${_network}.tar.gz | tar -xpf - scp -o User=$remote_user ${remote_host}:${_network}-config/openvpn_${_network}.tar.gz .
rm -f openvpn_${_network}.tar.gz gunzip < openvpn_${_network}.tar.gz | tar -xpf -
rm -f openvpn_${_network}.tar.gz
fi
if ssh -l $remote_user ${remote_host} [ -f "${_network}-config/root-dot-opennvpndir_${_network}.tar.gz" ] ; then if ssh -l $remote_user ${remote_host} [ -f "${_network}-config/root-dot-opennvpndir_${_network}.tar.gz" ] ; then
scp -o User=$remote_user ${remote_host}:${_network}-config/root-dot-opennvpndir_${_network}.tar.gz . scp -o User=$remote_user ${remote_host}:${_network}-config/root-dot-opennvpndir_${_network}.tar.gz .