Fix unbound config dir

This commit is contained in:
angristan 2018-09-15 20:38:56 +02:00
parent 4a36948a6b
commit 7f78dae808

View file

@ -187,22 +187,22 @@ private-address: ::ffff:0:0/96" >> /etc/unbound/unbound.conf
if [[ $CONTINUE = "y" ]]; then if [[ $CONTINUE = "y" ]]; then
if [ -d "/etc/unbound/conf.d" ]; then if [ -d "/etc/unbound/unbound.conf.d" ]; then
# Debian / Ubuntu # Debian / Ubuntu
UNBOUND_CONF_D="/etc/unbound/conf.d" UNBOUND_CONF_D="/etc/unbound/unbound.conf.d"
if ! grep -qs "^include: \"/etc/unbound/unbound.conf.d/\*.conf\"" /etc/unbound/unbound.conf; then 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 echo 'include: "/etc/unbound/unbound.conf.d/*.conf"' >> /etc/unbound/unbound.conf
fi fi
elif [ -d "/etc/unbound/unbound.conf.d" ]; then elif [ -d "/etc/unbound/conf.d" ]; then
# CentOS / Fedora # CentOS / Fedora
UNBOUND_CONF_D="/etc/unbound/unbound.conf.d" UNBOUND_CONF_D="/etc/unbound/conf.d"
if ! grep -qs "^include: /etc/unbound/conf.d/\*.conf" /etc/unbound/unbound.conf; then 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 echo 'include: /etc/unbound/conf.d/*.conf' >> /etc/unbound/unbound.conf
fi fi
else else
UNBOUND_CONF_D="/etc/unbound/conf.d" UNBOUND_CONF_D="/etc/unbound/conf.d"
mkdir -p $UNBOUND_CONF_D mkdir -p $UNBOUND_CONF_D
echo 'include: "/etc/unbound/unbound.conf.d/*.conf"' >> /etc/unbound/unbound.conf echo 'include: "/etc/unbound/conf.d/*.conf"' >> /etc/unbound/unbound.conf
fi fi
# Add OpenVPN integration # Add OpenVPN integration