Fabio/openvpn-install
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify Unbound config for existing installs

Browse source
This commit is contained in:
angristan 2018-09-15 20:53:49 +02:00
parent 7f78dae808
commit 4c523f8d36
1 changed files with 5 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
openvpn-install.sh
View file

@ -187,28 +187,12 @@ private-address: ::ffff:0:0/96" >> /etc/unbound/unbound.conf
if [[ $CONTINUE = "y" ]]; then
if [ -d "/etc/unbound/unbound.conf.d" ]; then
# Debian / Ubuntu
UNBOUND_CONF_D="/etc/unbound/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/conf.d" ]; then
# CentOS / Fedora
UNBOUND_CONF_D="/etc/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/conf.d/*.conf"' >> /etc/unbound/unbound.conf
fi
echo 'include: /etc/unbound/openvpn.conf' >> /etc/unbound/unbound.conf
# Add OpenVPN integration
echo 'server:
interface: 10.8.0.1
access-control: 10.8.0.1/24 allow' >> ${UNBOUND_CONF_D}/openvpn.conf
access-control: 10.8.0.1/24 allow' >> /etc/unbound/openvpn.conf
# Restart the service
systemctl restart unbound
@ -354,17 +338,11 @@ if [[ -e /etc/openvpn/server.conf ]]; then
rm -rf /etc/openvpn
rm -rf /usr/share/doc/openvpn*
if [[ -e /etc/unbound/unbound.conf ]]; then
if [[ -e /etc/unbound/openvpn.conf ]]; then
if [ -d "/etc/unbound/conf.d" ]; then
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
UNBOUND_CONF_D="/etc/unbound/unbound.conf.d"
sed -i 's|include: "\/etc\/unbound\/unbound.conf.d\/\*.conf"||' /etc/unbound/unbound.conf
fi
sed -i 's|include: \/etc\/unbound\/openvpn.conf||' /etc/unbound/unbound.conf
rm ${UNBOUND_CONF_D}/openvpn.conf >> /dev/null 2>&1
rm /etc/openvpn/openvpn.conf
until [[ $REMOVE_UNBOUND == "y" || $REMOVE_UNBOUND == "n" ]]; do
echo ""