From a7565e2b23b70357fb6fc47e0bd4d877435f292e Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Sun, 30 Jun 2024 21:14:45 +0100 Subject: [PATCH] Default upstream DNS to Google and remove the mention of the environment variable from the quickstart compose file. Signed-off-by: Adam Warner --- README.md | 4 +--- examples/docker-compose-caddy-proxy.yml | 4 +--- src/bash_functions.sh | 9 +++------ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 2cd2b21..b1b6aa8 100644 --- a/README.md +++ b/README.md @@ -47,9 +47,7 @@ services: # Set the appropriate timezone for your location (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), e.g: TZ: 'Europe/London' # Set a password to access the web interface. Not setting one will result in a random password being assigned - FTLCONF_webserver_api_password: 'correct horse battery staple' - # Configure DNS upstream servers, e.g: - FTLCONF_dns_upstreams: '8.8.8.8;8.8.4.4' + FTLCONF_webserver_api_password: 'correct horse battery staple' # Volumes store your data between container upgrades volumes: # For persisting Pi-hole's databases and common configuration file diff --git a/examples/docker-compose-caddy-proxy.yml b/examples/docker-compose-caddy-proxy.yml index 49e6fde..28e7d11 100644 --- a/examples/docker-compose-caddy-proxy.yml +++ b/examples/docker-compose-caddy-proxy.yml @@ -35,9 +35,7 @@ services: # Set the appropriate timezone for your location (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), e.g: TZ: 'Europe/London' # Set a password to access the web interface. Not setting one will result in a random password being assigned - FTLCONF_webserver_api_password: 'correct horse battery staple' - # Configure DNS upstream servers, e.g: - FTLCONF_dns_upstreams: '8.8.8.8;8.8.4.4' + FTLCONF_webserver_api_password: 'correct horse battery staple' # Volumes store your data between container upgrades volumes: # For persisting Pi-hole's databases and common configuration file diff --git a/src/bash_functions.sh b/src/bash_functions.sh index a455e1a..d732199 100644 --- a/src/bash_functions.sh +++ b/src/bash_functions.sh @@ -62,12 +62,9 @@ ensure_basic_configuration() { fi # If getFTLConfigValue "dns.upstreams" returns [], exit the container. We need upstream servers to function! - if [[ $(getFTLConfigValue "dns.upstreams") == "[]" ]]; then - echo "" - echo " [X] No DNS upstream servers are set!" - echo " [i] Recommended: Set the upstream DNS servers in the environment variable FTLCONF_dns_upstreams" - echo "" - exit 1 + if [[ $(getFTLConfigValue "dns.upstreams") == "[]" ]]; then + echo " [i] No DNS upstream set in environment or config file, defaulting to Google DNS" + setFTLConfigValue "dns.upstreams" "[\"8.8.8.8\", \"8.8.4.4\"]" fi setup_web_password