From 10ad624fdd6aaeb368113d4e33f382f7ecd1d8be Mon Sep 17 00:00:00 2001
From: root <root@gw-al.ga.netz>
Date: Tue, 21 Feb 2017 16:48:17 +0100
Subject: [PATCH] Ommit OpenVPN if not installed.

---
 change_network_gateway.sh     | 18 ++++++++++--------
 copy_gateway-config.sh        |  6 ++++--
 remote-copy_gateway-config.sh |  8 +++++---
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/change_network_gateway.sh b/change_network_gateway.sh
index 59818d8..147518f 100755
--- a/change_network_gateway.sh
+++ b/change_network_gateway.sh
@@ -121,14 +121,16 @@ fi
 # - OpenVPN:
 # -    /etc/openvpn/*
 # -
-echo -en "\tVPN settings.."
-/etc/init.d/openvpn stop > /dev/null
-rm -rf /etc/openvpn
-cp -a ${base_dir}/${network}/openvpn /etc/openvpn
-if [ "$?" != "0" ]; then
-   echo_FAILED
-else
-   echo_OK
+if [[ -d "/etc/openvpn" ]]; then
+   echo -en "\tVPN settings.."
+   /etc/init.d/openvpn stop > /dev/null
+   rm -rf /etc/openvpn
+   cp -a ${base_dir}/${network}/openvpn /etc/openvpn
+   if [ "$?" != "0" ]; then
+      echo_FAILED
+   else
+      echo_OK
+   fi
 fi
 
 if [ -d "/root/.openvpn" ]; then
diff --git a/copy_gateway-config.sh b/copy_gateway-config.sh
index f3b4e9e..e2ea5a3 100755
--- a/copy_gateway-config.sh
+++ b/copy_gateway-config.sh
@@ -70,8 +70,10 @@ chown ${user}:${user} ${homedir_user}/${_dir}/bind_${_network}.tar.gz
 # - OpenVPN:
 # -    /etc/openvpn/*
 # -
-tar -czpf ${homedir_user}/${_dir}/openvpn_${_network}.tar.gz -C ${filesystem_prefix}/etc openvpn
-chown ${user}:${user} ${homedir_user}/${_dir}/openvpn_${_network}.tar.gz
+if [[ -d "${filesystem_prefix}/etc/openvpn" ]]: then
+   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
    tar -czpf ${homedir_user}/${_dir}/root-dot-opennvpndir_${_network}.tar.gz -C /root .openvpn
diff --git a/remote-copy_gateway-config.sh b/remote-copy_gateway-config.sh
index b4a53be..e2c2345 100755
--- a/remote-copy_gateway-config.sh
+++ b/remote-copy_gateway-config.sh
@@ -76,9 +76,11 @@ scp -o User=$remote_user ${remote_host}:${_network}-config/bind_${_network}.tar.
 gunzip < bind_${_network}.tar.gz | tar -xpf -
 rm -f bind_${_network}.tar.gz
 
-scp -o User=$remote_user ${remote_host}:${_network}-config/openvpn_${_network}.tar.gz .
-gunzip < openvpn_${_network}.tar.gz | tar -xpf -
-rm -f  openvpn_${_network}.tar.gz
+if ssh -l $remote_user ${remote_host} [ -f "${_network}-config/openvpn_${_network}.tar.gz" ]; then
+   scp -o User=$remote_user ${remote_host}:${_network}-config/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
    scp -o User=$remote_user ${remote_host}:${_network}-config/root-dot-opennvpndir_${_network}.tar.gz .