From 448fc7231c55314585053e658b3f5e148ed447bf Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Mon, 30 Jul 2018 14:26:07 -0700 Subject: [PATCH] Installed to `/etc/pihole` as PI_HOLE_CONFIG_DIR variable. Signed-off-by: Dan Schaper --- automated install/basic-install.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 0c257e96..178673a4 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -47,6 +47,7 @@ PI_HOLE_LOCAL_REPO="/etc/.pihole" PI_HOLE_FILES=(chronometer list piholeDebug piholeLogFlush setupLCD update version gravity uninstall webpage) # This folder is where the Pi-hole scripts will be installed PI_HOLE_INSTALL_DIR="/opt/pihole" +PI_HOLE_CONFIG_DIR="/etc/pihole" useUpdateVars=false adlistFile="/etc/pihole/adlists.list" @@ -1236,9 +1237,9 @@ installConfigs() { # Make sure Pi-hole's config files are in place version_check_dnsmasq # Install template if it does not exist - if [[ ! -f "${PI_HOLE_INSTALL_DIR}/pihole-FTL.conf" ]]; then - if ! install -o pihole -g pihole -m 664 /dev/null "${PI_HOLE_INSTALL_DIR}/pihole-FTL.conf" &>/dev/nul; then - echo -e " ${COL_LIGHT_RED}Error: Unable to initialize configuration file ${PI_HOLE_INSTALL_DIR}/pihole-FTL.conf" + if [[ ! -f "${PI_HOLE_CONFIG_DIR}/pihole-FTL.conf" ]]; then + if ! install -o pihole -g pihole -m 664 /dev/null "${PI_HOLE_CONFIG_DIR}/pihole-FTL.conf" &>/dev/nul; then + echo -e " ${COL_LIGHT_RED}Error: Unable to initialize configuration file ${PI_HOLE_CONFIG_DIR}/pihole-FTL.conf" return 1 fi fi