From 4e7ca51bebc7cc44e466a6b78fd143588fce2dc2 Mon Sep 17 00:00:00 2001 From: Eric Warnke Date: Mon, 31 Oct 2016 21:24:57 -0400 Subject: [PATCH 1/2] 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/2] 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} )