From 3a90c1c1923c972be3e4ebfa40d7ab01b956488e Mon Sep 17 00:00:00 2001 From: DL6ER Date: Tue, 3 Jan 2017 13:34:01 +0100 Subject: [PATCH 1/3] Source setupVars.conf before trying to access variables --- advanced/Scripts/webpage.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh index 7fb339de..09f0e7dd 100755 --- a/advanced/Scripts/webpage.sh +++ b/advanced/Scripts/webpage.sh @@ -179,9 +179,10 @@ SetQueryLogOptions(){ ProcessDHCPSettings() { + source "${setupVars}" + if [[ "${DHCP_ACTIVE}" == "true" ]]; then - source "${setupVars}" interface=$(grep 'PIHOLE_INTERFACE=' /etc/pihole/setupVars.conf | sed "s/.*=//") # Use eth0 as fallback interface From 200995bf293adf65706ea6334cd1ec41f1e28efc Mon Sep 17 00:00:00 2001 From: DL6ER Date: Tue, 3 Jan 2017 14:24:33 +0100 Subject: [PATCH 2/3] Make IPv6 features of Pi-hole DHCP server switchable --- advanced/Scripts/webpage.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh index 09f0e7dd..18ed982f 100755 --- a/advanced/Scripts/webpage.sh +++ b/advanced/Scripts/webpage.sh @@ -215,12 +215,16 @@ dhcp-option=option:router,${DHCP_ROUTER} dhcp-leasefile=/etc/pihole/dhcp.leases domain=${PIHOLE_DOMAIN} #quiet-dhcp -#quiet-dhcp6 +" > "${dhcpconfig}" + + if [[ "${DHCP_IPv6}" == "true" ]]; then +echo "#quiet-dhcp6 #enable-ra dhcp-option=option6:dns-server,[::] dhcp-range=::100,::1ff,constructor:${interface},ra-names,slaac,${leasetime} ra-param=*,0,0 -" > "${dhcpconfig}" +" >> "${dhcpconfig}" + fi else rm "${dhcpconfig}" @@ -235,6 +239,7 @@ EnableDHCP(){ change_setting "DHCP_ROUTER" "${args[4]}" change_setting "DHCP_LEASETIME" "${args[5]}" change_setting "PIHOLE_DOMAIN" "${args[6]}" + change_setting "DHCP_IPv6" "${args[7]}" # Remove possible old setting from file delete_dnsmasq_setting "dhcp-" From 806f44abe61597f59809342f7f5b7e93f812e4d8 Mon Sep 17 00:00:00 2001 From: Jacob Salmela Date: Wed, 4 Jan 2017 09:01:03 -0600 Subject: [PATCH 3/3] replace dead link to another LED blink project page --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 311c8704..9da58540 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ The [Web interface](https://github.com/pi-hole/AdminLTE#pi-hole-admin-dashboard) ### Whitelist and blacklist -Domains can be whitelisted and blacklisted using either the web interface or the command line. See [the wiki page](https://github.com/pi-hole/pi-hole/wiki/Whitelisting-and-Blacklisting) for more details +Domains can be whitelisted and blacklisted using either the web interface or the command line. See [the wiki page](https://github.com/pi-hole/pi-hole/wiki/Whitelisting-and-Blacklisting) for more details

@@ -128,7 +128,7 @@ You can view [real-time stats](http://pi-hole.net/faq/install-the-real-time-lcd- ## Pi-hole Projects - [Pi-hole stats in your Mac's menu bar](https://getbitbar.com/plugins/Network/pi-hole.1m.py) -- [Get LED alerts for each blocked ad](http://www.stinebaugh.info/get-led-alerts-for-each-blocked-ad-using-pi-hole/) +- [Get LED alerts for each blocked ad](http://thetimmy.silvernight.org/pages/endisbutton/) - [Pi-hole on Ubuntu 14.04 on VirtualBox](http://hbalagtas.blogspot.com/2016/02/adblocking-with-pi-hole-and-ubuntu-1404.html) - [Docker Pi-hole container (x86 and ARM)](https://hub.docker.com/r/diginc/pi-hole/) - [Splunk: Pi-hole Visualizser](https://splunkbase.splunk.com/app/3023/)