martin/ProxmoxVE
1
0
Fork 0
mirror of https://github.com/community-scripts/ProxmoxVE synced 2025-01-10 10:55:10 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Update pihole-install.sh (#235)
Some checks are pending
Deploy Next.js site to Pages / build (push) Waiting to run
Details
Deploy Next.js site to Pages / deploy (push) Blocked by required conditions
Details

Browse Source 
* Update pihole-install.sh

* Added the option to configure Unbound as a forwarding DNS server (using DNS-over-TLS (DoT)).

* Simplified the Unbound configuration.  The root hints file is actually provided by the dns-root-data package so there is no need to explicitly define it (via the root-hints configuration directive) and wget it.  Also, there was no mechanism to update the file after the initial fetch - this will now done by the package manager.

* Fix: Unbound (127.0.0.1#5335) would not become active until a configuration change was made and saved or the application was updated.  These are the only times (other than during install) that /etc/dnsmasq.d/01-pihole.conf is synced with /etc/pihole/setupVars.conf.  Updated the install script to swap out the dns server in /etc/dnsmasq.d/01-pihole.conf similar to /etc/pihole/setupVars.conf.  Delete 8.8.4.4 in both files as opposed to commenting it out as the commented out line would never be recycled.

* Update pihole.json

* Update install/pihole-install.sh

Updated the prompt text after code review.

Co-authored-by: Håvard Gjøby Thom <34199185+havardthom@users.noreply.github.com>

---------

Co-authored-by: Håvard Gjøby Thom <34199185+havardthom@users.noreply.github.com>
This commit is contained in:
davalanche 2024-11-14 16:00:58 -06:00 committed by GitHub
parent e622081c5c
commit 5367a1751a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
install/pihole-install.sh
View File

@ -44,6 +44,7 @@ msg_ok "Installed Pi-hole"
read -r -p "Would you like to add Unbound? <y/N> " prompt
if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
read -r -p "Unbound is configured as a recursive DNS server by default, would you like it to be configured as a forwarding DNS server (using DNS-over-TLS (DoT)) instead? <y/N> " prompt
msg_info "Installing Unbound"
$STD apt-get install -y unbound
cat <<EOF >/etc/unbound/unbound.conf.d/pi-hole.conf
@ -73,7 +74,6 @@ server:
infra-cache-slabs: 8
key-cache-slabs: 8
serve-expired: yes
root-hints: /var/lib/unbound/root.hints
serve-expired-ttl: 3600
edns-buffer-size: 1232
prefetch: yes
@ -94,8 +94,34 @@ EOF
cat <<EOF >/etc/dnsmasq.d/99-edns.conf
edns-packet-max=1232
EOF
wget -qO /var/lib/unbound/root.hints https://www.internic.net/domain/named.root
sed -i -e 's/PIHOLE_DNS_1=8.8.8.8/PIHOLE_DNS_1=127.0.0.1#5335/' -e 's/PIHOLE_DNS_2=8.8.4.4/#PIHOLE_DNS_2=8.8.4.4/' /etc/pihole/setupVars.conf
if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
cat <<EOF >>/etc/unbound/unbound.conf.d/pi-hole.conf
tls-cert-bundle: "/etc/ssl/certs/ca-certificates.crt"
forward-zone:
name: "."
forward-tls-upstream: yes
forward-first: no
forward-addr: 8.8.8.8@853#dns.google
forward-addr: 8.8.4.4@853#dns.google
forward-addr: 2001:4860:4860::8888@853#dns.google
forward-addr: 2001:4860:4860::8844@853#dns.google
#forward-addr: 1.1.1.1@853#cloudflare-dns.com
#forward-addr: 1.0.0.1@853#cloudflare-dns.com
#forward-addr: 2606:4700:4700::1111@853#cloudflare-dns.com
#forward-addr: 2606:4700:4700::1001@853#cloudflare-dns.com
#forward-addr: 9.9.9.9@853#dns.quad9.net
#forward-addr: 149.112.112.112@853#dns.quad9.net
#forward-addr: 2620:fe::fe@853#dns.quad9.net
#forward-addr: 2620:fe::9@853#dns.quad9.net
EOF
fi
sed -i -e 's/PIHOLE_DNS_1=8.8.8.8/PIHOLE_DNS_1=127.0.0.1#5335/' -e '/PIHOLE_DNS_2=8.8.4.4/d' /etc/pihole/setupVars.conf
sed -i -e 's/server=8.8.8.8/server=127.0.0.1#5335/' -e '/server=8.8.4.4/d' /etc/dnsmasq.d/01-pihole.conf
systemctl enable -q --now unbound
systemctl restart pihole-FTL.service
msg_ok "Installed Unbound"

8
json/pihole.json
View File

@ -37,7 +37,11 @@
},
{
"text": "With an option to add Unbound",
"type": "warning"
"type": "info"
},
{
"text": "With an option to configure Unbound as a forwarding DNS server (using DNS-over-TLS (DoT)) as opposed to a recursive DNS server",
"type": "info"
}
]
}
}