diff --git a/install/pihole-install.sh b/install/pihole-install.sh index 00b13936..d9643b31 100644 --- a/install/pihole-install.sh +++ b/install/pihole-install.sh @@ -21,42 +21,6 @@ $STD apt-get install -y ufw $STD apt-get install -y ntp msg_ok "Installed Dependencies" -read -r -p "Would you like to add Unbound? " prompt -if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then - msg_info "Installing Unbound" - $STD apt-get install -y unbound - cat </etc/unbound/unbound.conf.d/pi-hole.conf -server: - verbosity: 0 - interface: 0.0.0.0 - port: 5335 - do-ip4: yes - do-udp: yes - do-tcp: yes - do-ip6: no - prefer-ip6: no - harden-glue: yes - harden-dnssec-stripped: yes - use-caps-for-id: no - edns-buffer-size: 1232 - prefetch: yes - num-threads: 1 - private-address: 192.168.0.0/24 - private-address: 169.254.0.0/16 - private-address: 172.16.0.0/12 - private-address: 10.0.0.0/8 - private-address: fd00::/8 - private-address: fe80::/10 -EOF - mkdir -p /etc/dnsmasq.d/ && sudo touch /etc/dnsmasq.d/99-edns.conf - cat </etc/dnsmasq.d/99-edns.conf -edns-packet-max=1232 -EOF - wget -q https://www.internic.net/domain/named.root >/var/lib/unbound/root.hints - systemctl enable -q --now unbound - msg_ok "Installed Unbound" -fi - msg_info "Installing Pi-hole" mkdir -p /etc/pihole/ cat </etc/pihole/setupVars.conf @@ -78,6 +42,42 @@ EOF $STD bash <(curl -fsSL https://install.pi-hole.net) --unattended msg_ok "Installed Pi-hole" +read -r -p "Would you like to add Unbound? " prompt +if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then + msg_info "Installing Unbound" + $STD apt-get install -y unbound + cat </etc/unbound/unbound.conf.d/pi-hole.conf +server: + verbosity: 0 + interface: 0.0.0.0 + port: 5335 + do-ip4: yes + do-udp: yes + do-tcp: yes + do-ip6: no + prefer-ip6: no + harden-glue: yes + harden-dnssec-stripped: yes + use-caps-for-id: no + edns-buffer-size: 1232 + prefetch: yes + num-threads: 1 + private-address: 192.168.0.0/16 + private-address: 169.254.0.0/16 + private-address: 172.16.0.0/12 + private-address: 10.0.0.0/8 + private-address: fd00::/8 + private-address: fe80::/10 +EOF + mkdir -p /etc/dnsmasq.d/ && sudo touch /etc/dnsmasq.d/99-edns.conf + cat </etc/dnsmasq.d/99-edns.conf +edns-packet-max=1232 +EOF + wget -q https://www.internic.net/domain/named.root >/var/lib/unbound/root.hints + systemctl enable -q --now unbound + msg_ok "Installed Unbound" +fi + motd_ssh customize