From 4e7ca51bebc7cc44e466a6b78fd143588fce2dc2 Mon Sep 17 00:00:00 2001 From: Eric Warnke Date: Mon, 31 Oct 2016 21:24:57 -0400 Subject: [PATCH 1/7] Added dependancy for ping and lsof used in debug scripts --- automated install/basic-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 6489a5fc..93974211 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -91,7 +91,7 @@ if [ -x "$(command -v apt-get)" ]; then ${PKG_MANAGER} install --dry-run php5 > /dev/null 2>&1 && phpVer="php5" || phpVer="php" # ######################################### INSTALLER_DEPS=( apt-utils whiptail git dhcpcd5) - PIHOLE_DEPS=( dnsutils bc dnsmasq lighttpd ${phpVer}-common ${phpVer}-cgi curl unzip wget sudo netcat cron ${IPROUTE_PKG} ) + PIHOLE_DEPS=( iputils-ping lsof dnsutils bc dnsmasq lighttpd ${phpVer}-common ${phpVer}-cgi curl unzip wget sudo netcat cron ${IPROUTE_PKG} ) LIGHTTPD_USER="www-data" LIGHTTPD_GROUP="www-data" LIGHTTPD_CFG="lighttpd.conf.debian" From fb5ac6d6d74e00843c53e07ab188635d6aba9e7e Mon Sep 17 00:00:00 2001 From: Eric Warnke Date: Mon, 31 Oct 2016 21:31:13 -0400 Subject: [PATCH 2/7] We should prefer the php metapackage if it's there, falling back on php5 if it's not --- automated install/basic-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 93974211..c8312a01 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -87,8 +87,8 @@ if [ -x "$(command -v apt-get)" ]; then # fixes for dependancy differences # Debian 7 doesn't have iproute2 use iproute ${PKG_MANAGER} install --dry-run iproute2 > /dev/null 2>&1 && IPROUTE_PKG="iproute2" || IPROUTE_PKG="iproute" - # Ubuntu 16.04 LTS php / php5 fix - ${PKG_MANAGER} install --dry-run php5 > /dev/null 2>&1 && phpVer="php5" || phpVer="php" + # Prefer the php metapackage if it's there, fall back on the php5 pacakges + ${PKG_MANAGER} install --dry-run php > /dev/null 2>&1 && phpVer="php" || phpVer="php5" # ######################################### INSTALLER_DEPS=( apt-utils whiptail git dhcpcd5) PIHOLE_DEPS=( iputils-ping lsof dnsutils bc dnsmasq lighttpd ${phpVer}-common ${phpVer}-cgi curl unzip wget sudo netcat cron ${IPROUTE_PKG} ) From c755b3c49ef82c50d429a5e834a9c64060b3ab47 Mon Sep 17 00:00:00 2001 From: Markus Busche Date: Fri, 4 Nov 2016 21:56:14 +0100 Subject: [PATCH 3/7] Added Link to blink1_pi-hole.py --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7257ba4e..a8995566 100644 --- a/README.md +++ b/README.md @@ -103,6 +103,7 @@ You can view [real-time stats](http://pi-hole.net/faq/install-the-real-time-lcd- - [Pi-hole on/off button](http://thetimmy.silvernight.org/pages/endisbutton/) - [Minibian Pi-hole](http://munkjensen.net/wiki/index.php/See_my_Pi-Hole#Minibian_Pi-hole) - [Windows Tray Stat Application](https://github.com/goldbattle/copernicus) +- [Let your blink1 device blink when Pi-hole filters ads](https://gist.github.com/elpatron68/ec0b4c582e5abf604885ac1e068d233f) ## Coverage From e5cc38a210185b882ddc74e46d9e03c64046ff66 Mon Sep 17 00:00:00 2001 From: Jacob Salmela Date: Sun, 6 Nov 2016 08:08:58 -0600 Subject: [PATCH 4/7] Direct users to Discourse for FRs It's a better platform for it because users can vote and we can have easier discussions for it. --- .github/ISSUE_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 53f5b429..7994f9d2 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -20,7 +20,7 @@ --- **[FEATURE REQUEST | QUESTION | OTHER]:** -_{replace this section with your content or delete if not a FEATURE REQUEST/QUESTION/OTHER}_ +Please [submit your feature request here](https://discourse.pi-hole.net/c/feature-requests), so it is votable by the community. It's also easier for us to track. **[BUG | ISSUE] Expected Behaviour:** From a0f0dff88ec7e0dde30aa278bf42f5e5556258ba Mon Sep 17 00:00:00 2001 From: Jacob Salmela Date: Sun, 6 Nov 2016 08:18:57 -0600 Subject: [PATCH 5/7] replace hardcoded interface with var setupVars.conf is already sourced, so we just need to replace the hardcoded value with the variable name. --- advanced/Scripts/chronometer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advanced/Scripts/chronometer.sh b/advanced/Scripts/chronometer.sh index 2e6cabda..46051a20 100755 --- a/advanced/Scripts/chronometer.sh +++ b/advanced/Scripts/chronometer.sh @@ -80,7 +80,7 @@ normalChrono() { echo "| _/ |___| ' \/ _ \ / -_)" echo "|_| |_| |_||_\___/_\___|" echo "" - echo " $(ifconfig eth0 | awk '/inet addr/ {print $2}' | cut -d':' -f2)" + echo " $(ifconfig ${PIHOLE_INTERFACE} | awk '/inet addr/ {print $2}' | cut -d':' -f2)" echo "" uptime | cut -d' ' -f11- #uptime -p #Doesn't work on all versions of uptime From ca56ca5bd85fec8f7c89b1956f14e4c4ad59a1a6 Mon Sep 17 00:00:00 2001 From: Jacob Salmela Date: Sun, 6 Nov 2016 11:16:48 -0600 Subject: [PATCH 6/7] promo-tweak Better logic introduced by @PromoFaux --- advanced/Scripts/chronometer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advanced/Scripts/chronometer.sh b/advanced/Scripts/chronometer.sh index 46051a20..7f2c764a 100755 --- a/advanced/Scripts/chronometer.sh +++ b/advanced/Scripts/chronometer.sh @@ -80,7 +80,7 @@ normalChrono() { echo "| _/ |___| ' \/ _ \ / -_)" echo "|_| |_| |_||_\___/_\___|" echo "" - echo " $(ifconfig ${PIHOLE_INTERFACE} | awk '/inet addr/ {print $2}' | cut -d':' -f2)" + echo " ${IPV4_ADDRESS}" echo "" uptime | cut -d' ' -f11- #uptime -p #Doesn't work on all versions of uptime From 0caa44e9797dab02397c1fa0afd06d82cc69a56f Mon Sep 17 00:00:00 2001 From: bcambl Date: Mon, 7 Nov 2016 12:54:31 -0600 Subject: [PATCH 7/7] write ifcfg instead of appending --- automated install/basic-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 14d271ef..abeb7fbe 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -423,7 +423,7 @@ setStaticIPv4() { echo "DNS1=$PIHOLE_DNS_1" echo "DNS2=$PIHOLE_DNS_2" echo "USERCTL=no" - }>> "${IFCFG_FILE}" + }> "${IFCFG_FILE}" ip addr replace dev "${PIHOLE_INTERFACE}" "${IPV4_ADDRESS}" if [ -x "$(command -v nmcli)" ];then # Tell NetworkManager to read our new sysconfig file