Marown/openvpn-install
1
0
Fork 0
mirror of https://github.com/hwdsl2/openvpn-install.git synced 2024-07-02 17:55:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix resolv.conf detection

Browse Source 
- Apply upstream change Nyr/openvpn-install commit d28c8e7.
- Some systems have other DNS servers along with 127.0.0.53 in /etc/resolv.conf.
This commit is contained in:
hwdsl2 2022-08-21 22:29:43 -05:00
parent 56c3d97661
commit 97635f7cb6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openvpn-install.sh
View File

@ -344,13 +344,13 @@ server 10.8.0.0 255.255.255.0" > /etc/openvpn/server/server.conf
1|"")
# Locate the proper resolv.conf
# Needed for systems running systemd-resolved
if grep -q '^nameserver 127.0.0.53' "/etc/resolv.conf"; then
resolv_conf="/run/systemd/resolve/resolv.conf"
else
if grep '^nameserver' "/etc/resolv.conf" | grep -qv '127.0.0.53' ; then
resolv_conf="/etc/resolv.conf"
else
resolv_conf="/run/systemd/resolve/resolv.conf"
fi
# Obtain the resolvers from resolv.conf and use them for OpenVPN
grep -v '^#\|^;' "$resolv_conf" | grep '^nameserver' | grep -oE '[0-9]{1,3}(\.[0-9]{1,3}){3}' | while read line; do
grep -v '^#\|^;' "$resolv_conf" | grep '^nameserver' | grep -v '127.0.0.53' | grep -oE '[0-9]{1,3}(\.[0-9]{1,3}){3}' | while read line; do
echo "push \"dhcp-option DNS $line\"" >> /etc/openvpn/server/server.conf
done
;;