From 0da97e762f851a9a801b905e4816d47bb665899c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Mon, 3 Feb 2025 08:31:33 +0100 Subject: [PATCH] Remove outdated dns-servers.conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- automated install/basic-install.sh | 7 ------- test/test_any_automated_install.py | 5 ----- 2 files changed, 12 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 719a57fc..2e202861 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -1279,13 +1279,6 @@ installConfigs() { # Ensure that permissions are correctly set chown -R pihole:pihole /etc/pihole - # Install list of DNS servers - # Format: Name;Primary IPv4;Secondary IPv4;Primary IPv6;Secondary IPv6 - # Some values may be empty (for example: DNS servers without IPv6 support) - echo "${DNS_SERVERS}" >"${PI_HOLE_CONFIG_DIR}/dns-servers.conf" - chmod 644 "${PI_HOLE_CONFIG_DIR}/dns-servers.conf" - chown pihole:pihole "${PI_HOLE_CONFIG_DIR}/dns-servers.conf" - # Install empty custom.list file if it does not exist if [[ ! -r "${PI_HOLE_CONFIG_DIR}/hosts/custom.list" ]]; then if ! install -D -T -o pihole -g pihole -m 660 /dev/null "${PI_HOLE_CONFIG_DIR}/hosts/custom.list" &>/dev/null; then diff --git a/test/test_any_automated_install.py b/test/test_any_automated_install.py index 19812122..73da7eef 100644 --- a/test/test_any_automated_install.py +++ b/test/test_any_automated_install.py @@ -119,11 +119,6 @@ def test_installPihole_fresh_install_readableFiles(host): assert exit_status_success == actual_rc check_leases = test_cmd.format("w", "/etc/pihole/dhcp.leases", piholeuser) actual_rc = host.run(check_leases).rc - # readable dns-servers.conf - assert exit_status_success == actual_rc - check_servers = test_cmd.format("r", "/etc/pihole/dns-servers.conf", piholeuser) - actual_rc = host.run(check_servers).rc - assert exit_status_success == actual_rc # readable install.log check_install = test_cmd.format("r", "/etc/pihole/install.log", piholeuser) actual_rc = host.run(check_install).rc