From a8310fd686d75bb47f035fe4b73b3dda18899c97 Mon Sep 17 00:00:00 2001
From: angristan <angristan@pm.me>
Date: Sat, 15 Sep 2018 20:20:31 +0200
Subject: [PATCH] Handle non vanilla unbound installs For example wiht
 local-dns-installer we don't have an include

---
 openvpn-install.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/openvpn-install.sh b/openvpn-install.sh
index 6e8cf65..e59679b 100644
--- a/openvpn-install.sh
+++ b/openvpn-install.sh
@@ -189,9 +189,19 @@ private-address: ::ffff:0:0/96" >> /etc/unbound/unbound.conf
 			if [ -d "/etc/unbound/conf.d" ]; then
 				# Debian / Ubuntu
 				UNBOUND_CONF_D="/etc/unbound/conf.d"
+				if ! grep -qs "^include: \"/etc/unbound/unbound.conf.d/\*.conf\"" /etc/unbound/unbound.conf; then
+					echo 'include: "/etc/unbound/unbound.conf.d/*.conf"' >> /etc/unbound/unbound.conf
+				fi
 			elif [ -d "/etc/unbound/unbound.conf.d" ]; then
 				# CentOS / Fedora
 				UNBOUND_CONF_D="/etc/unbound/unbound.conf.d"
+				if ! grep -qs "^include: /etc/unbound/conf.d/\*.conf" /etc/unbound/unbound.conf; then
+					echo 'include: /etc/unbound/conf.d/*.conf' >> /etc/unbound/unbound.conf
+				fi
+			else
+				UNBOUND_CONF_D="/etc/unbound/conf.d"
+				mkdir -p $UNBOUND_CONF_D
+				echo 'include: "/etc/unbound/unbound.conf.d/*.conf"' >> /etc/unbound/unbound.conf
 			fi
 
 			# Add OpenVPN integration
@@ -346,11 +356,11 @@ if [[ -e /etc/openvpn/server.conf ]]; then
 				if [[ -e /etc/unbound/unbound.conf ]]; then
 
 					if [ -d "/etc/unbound/conf.d" ]; then
-						# Debian / Ubuntu
 						UNBOUND_CONF_D="/etc/unbound/conf.d"
+						sed -i 's|include: \/etc\/unbound\/conf.d\/\*.conf||' /etc/unbound/unbound.conf
 					elif [ -d "/etc/unbound/unbound.conf.d" ]; then
-						# CentOS / Fedora
 						UNBOUND_CONF_D="/etc/unbound/unbound.conf.d"
+						sed -i 's|include: "\/etc\/unbound\/unbound.conf.d\/\*.conf"||' /etc/unbound/unbound.conf
 					fi
 
 					rm ${UNBOUND_CONF_D}/openvpn.conf