From 7da57c6acddf6d77610b934f7902e134ee9ef377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Fri, 2 Jun 2023 00:03:22 +0200
Subject: [PATCH] Don't check and install old FTL config file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 automated install/basic-install.sh | 10 ----------
 test/test_any_automated_install.py | 12 +++---------
 test/test_any_utils.py             |  3 ++-
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 6663bbad..37e97e90 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -78,7 +78,6 @@ PI_HOLE_FILES=(chronometer list piholeDebug piholeLogFlush setupLCD update versi
 PI_HOLE_INSTALL_DIR="/opt/pihole"
 PI_HOLE_CONFIG_DIR="/etc/pihole"
 PI_HOLE_BIN_DIR="/usr/local/bin"
-FTL_CONFIG_FILE="${PI_HOLE_CONFIG_DIR}/pihole-FTL.conf"
 if [ -z "$useUpdateVars" ]; then
     useUpdateVars=false
 fi
@@ -1192,15 +1191,6 @@ installConfigs() {
     echo "${DNS_SERVERS}" > "${PI_HOLE_CONFIG_DIR}/dns-servers.conf"
     chmod 644 "${PI_HOLE_CONFIG_DIR}/dns-servers.conf"
 
-    # Install template file if it does not exist
-    if [[ ! -r "${FTL_CONFIG_FILE}" ]]; then
-        install -d -m 0755 ${PI_HOLE_CONFIG_DIR}
-        if ! install -T -o pihole -m 664 "${PI_HOLE_LOCAL_REPO}/advanced/Templates/pihole-FTL.conf" "${FTL_CONFIG_FILE}" &>/dev/null; then
-            printf "  %b Error: Unable to initialize configuration file %s/pihole-FTL.conf\\n" "${COL_LIGHT_RED}" "${PI_HOLE_CONFIG_DIR}"
-            return 1
-        fi
-    fi
-
     # Install empty custom.list file if it does not exist
     if [[ ! -r "${PI_HOLE_CONFIG_DIR}/custom.list" ]]; then
         if ! install -o root -m 644 /dev/null "${PI_HOLE_CONFIG_DIR}/custom.list" &>/dev/null; then
diff --git a/test/test_any_automated_install.py b/test/test_any_automated_install.py
index df9c4721..d5f76ba3 100644
--- a/test/test_any_automated_install.py
+++ b/test/test_any_automated_install.py
@@ -80,9 +80,10 @@ def test_installPihole_fresh_install_readableFiles(host):
     host.run("command -v dnf > /dev/null && dnf install -y man")
     host.run("command -v yum > /dev/null && yum install -y man")
     # Workaround to get FTLv6 installed until it reaches master branch
-    host.run("""
-        echo "new/http" > /etc/pihole/ftlbranch
+    host.run(
         """
+    echo "new/http" > /etc/pihole/ftlbranch
+    """
     )
     install = host.run(
         """
@@ -141,13 +142,6 @@ def test_installPihole_fresh_install_readableFiles(host):
     check_macvendor = test_cmd.format("r", "/etc/pihole/macvendor.db", piholeuser)
     actual_rc = host.run(check_macvendor).rc
     assert exit_status_success == actual_rc
-    # readable and writeable pihole-FTL.conf
-    check_FTLconf = test_cmd.format("r", "/etc/pihole/pihole-FTL.conf", piholeuser)
-    actual_rc = host.run(check_FTLconf).rc
-    assert exit_status_success == actual_rc
-    check_FTLconf = test_cmd.format("w", "/etc/pihole/pihole-FTL.conf", piholeuser)
-    actual_rc = host.run(check_FTLconf).rc
-    assert exit_status_success == actual_rc
     # check readable and executable /etc/init.d/pihole-FTL
     check_init = test_cmd.format("x", "/etc/init.d/pihole-FTL", piholeuser)
     actual_rc = host.run(check_init).rc
diff --git a/test/test_any_utils.py b/test/test_any_utils.py
index 8c1ea521..0f300457 100644
--- a/test/test_any_utils.py
+++ b/test/test_any_utils.py
@@ -129,7 +129,8 @@ def test_getFTLPIDFile_and_getFTLPID_custom(host):
 def test_getFTLConfigValue_getFTLConfigValue(host):
     """
     Confirms getFTLConfigValue works (also assumes setFTLConfigValue works)
-    Requires FTL to be installed, so we do that first (taken from test_FTL_development_binary_installed_and_responsive_no_errors)
+    Requires FTL to be installed, so we do that first
+    (taken from test_FTL_development_binary_installed_and_responsive_no_errors)
     """
     host.run(
         """