Pi-hole/pivpn
Pi-hole/pivpn
1
0
Fork 0
mirror of https://github.com/pivpn/pivpn.git synced 2025-04-26 01:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implemented feature request from issue #942 (WireGuard)

Browse source
This commit is contained in:
Orazio 2020-02-07 18:07:15 +01:00
parent bf0015c303
commit 3f616d9254
4 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
auto_install/install.sh
View file

@ -14,6 +14,7 @@
pivpnGitUrl="https://github.com/pivpn/pivpn.git"
setupVars="/etc/pivpn/setupVars.conf"
pivpnFilesDir="/etc/.pivpn"
dnsmasqConfig="/etc/dnsmasq.d/02-pivpn.conf"
### PKG Vars ###
PKG_MANAGER="apt-get"
@ -1417,8 +1418,10 @@ askClientDNS(){
# Detect and offer to use Pi-hole
if command -v pihole > /dev/null; then
if (whiptail --backtitle "Setup PiVPN" --title "Pi-hole" --yesno "We have detected a Pi-hole installation, do you want to use it as the DNS server for the VPN, so you get ad blocking on the go?" ${r} ${c}); then
echo "interface=$pivpnDEV" | $SUDO tee "$dnsmasqConfig" > /dev/null
echo "addn-hosts=/etc/pivpn/hosts.$VPN" | $SUDO tee -a "$dnsmasqConfig" > /dev/null
$SUDO bash -c "> /etc/pivpn/hosts.$VPN"
pivpnDNS1="$vpnGw"
echo "interface=$pivpnDEV" | $SUDO tee /etc/dnsmasq.d/02-pivpn.conf > /dev/null
echo "pivpnDNS1=${pivpnDNS1}" >> /tmp/setupVars.conf
echo "pivpnDNS2=${pivpnDNS2}" >> /tmp/setupVars.conf
return
@ -2078,7 +2081,7 @@ restartServices(){
;;
esac
if [ -f /etc/dnsmasq.d/02-pivpn.conf ]; then
if [ -f "$dnsmasqConfig" ]; then
$SUDO pihole restartdns
fi
}