diff options
| author | Adam Warner <me@adamwarner.co.uk> | 2020-07-16 01:56:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-16 01:56:47 +0300 |
| commit | 56cd7c4d59ceb629a2170cd1c8ab78ef26366019 (patch) | |
| tree | 288bed2d2e2e29dc122aebc558203a6f771a2235 | |
| parent | e9b039139c468798fb6d9457e4c9012171faee33 (diff) | |
| parent | f50cff54de8c212a613d31b54cc736f863d4f513 (diff) | |
Merge pull request #3549 from pi-hole/release/v5.1.1v5.1.1
Pi-hole core v5.1.1
| -rwxr-xr-x | advanced/Scripts/piholeDebug.sh | 2 | ||||
| -rwxr-xr-x | automated install/basic-install.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/advanced/Scripts/piholeDebug.sh b/advanced/Scripts/piholeDebug.sh index 3d42d7e1..d5da57ae 100755 --- a/advanced/Scripts/piholeDebug.sh +++ b/advanced/Scripts/piholeDebug.sh @@ -1264,7 +1264,7 @@ upload_to_tricorder() { # If they choose no, just exit out of the script *) log_write " * Log will ${COL_GREEN}NOT${COL_NC} be uploaded to tricorder.\\n * A local copy of the debug log can be found at: ${COL_CYAN}${PIHOLE_DEBUG_LOG}${COL_NC}\\n";exit; esac - fi232623 + fi # Check if tricorder.pi-hole.net is reachable and provide token # along with some additional useful information if [[ -n "${tricorder_token}" ]]; then diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 28001831..5aa20187 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -72,8 +72,8 @@ useUpdateVars=false adlistFile="/etc/pihole/adlists.list" # Pi-hole needs an IP address; to begin, these variables are empty since we don't know what the IP is until # this script can run -IPV4_ADDRESS="" -IPV6_ADDRESS="" +IPV4_ADDRESS=${IPV4_ADDRESS} +IPV6_ADDRESS=${IPV6_ADDRESS} # By default, query logging is enabled and the dashboard is set to be installed QUERY_LOGGING=true INSTALL_WEB_INTERFACE=true |