From a76a34939db53c7496da207dac1ba1ec574e91d4 Mon Sep 17 00:00:00 2001 From: Stanislas Date: Mon, 27 Apr 2020 18:01:33 +0200 Subject: [PATCH] fix merge conflict --- openvpn-install.sh | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/openvpn-install.sh b/openvpn-install.sh index b721ef5..7f3ec76 100755 --- a/openvpn-install.sh +++ b/openvpn-install.sh @@ -771,21 +771,6 @@ ifconfig-pool-persist ipp.txt" >>/etc/openvpn/server.conf # DNS resolvers case $DNS in - 1) - # Locate the proper resolv.conf - # Needed for systems running systemd-resolved - if grep -q "127.0.0.53" "/etc/resolv.conf"; then - RESOLVCONF='/run/systemd/resolve/resolv.conf' - else - RESOLVCONF='/etc/resolv.conf' - fi - # Obtain the resolvers from resolv.conf and use them for OpenVPN - sed -ne 's/^nameserver[[:space:]]\+\([^[:space:]]\+\).*$/\1/p' $RESOLVCONF | while read -r line; do - # Copy, if it's a IPv4 |or| if IPv6 is enabled, IPv4/IPv6 does not matter - if [[ "$line" =~ ^[0-9.]*$ ]] || [[ "$IPV6_SUPPORT" == 'y' ]]; then - echo "push \"dhcp-option DNS $line\"" >> /etc/openvpn/server.conf - fi - done 1) # Current system resolvers # Locate the proper resolv.conf # Needed for systems running systemd-resolved