From 59b0a6af6f07b8534388b2a5da6d894d989765e7 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Tue, 13 Oct 2020 23:53:23 +0100 Subject: [PATCH] Remove references to privacy level 4 (no longer functional) Signed-off-by: Adam Warner --- advanced/Scripts/webpage.sh | 6 +++--- advanced/bash-completion/pihole | 6 +++--- automated install/basic-install.sh | 1 - manpages/pihole-FTL.conf.5 | 4 +--- manpages/pihole.8 | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh index 1f7cc728..e9d23289 100755 --- a/advanced/Scripts/webpage.sh +++ b/advanced/Scripts/webpage.sh @@ -44,7 +44,7 @@ Options: -e, email Set an administrative contact address for the Block Page -h, --help Show this help dialog -i, interface Specify dnsmasq's interface listening behavior - -l, privacylevel Set privacy level (0 = lowest, 4 = highest)" + -l, privacylevel Set privacy level (0 = lowest, 3 = highest)" exit 0 } @@ -633,8 +633,8 @@ clearAudit() } SetPrivacyLevel() { - # Set privacy level. Minimum is 0, maximum is 4 - if [ "${args[2]}" -ge 0 ] && [ "${args[2]}" -le 4 ]; then + # Set privacy level. Minimum is 0, maximum is 3 + if [ "${args[2]}" -ge 0 ] && [ "${args[2]}" -le 3 ]; then changeFTLsetting "PRIVACYLEVEL" "${args[2]}" pihole restartdns reload-lists fi diff --git a/advanced/bash-completion/pihole b/advanced/bash-completion/pihole index 88282b02..25208a35 100644 --- a/advanced/bash-completion/pihole +++ b/advanced/bash-completion/pihole @@ -56,11 +56,11 @@ _pihole() { ;; "privacylevel") if ( [[ "$prev2" == "admin" ]] || [[ "$prev2" == "-a" ]] ); then - opts_privacy="0 1 2 3 4" + opts_privacy="0 1 2 3" COMPREPLY=( $(compgen -W "${opts_privacy}" -- ${cur}) ) - else + else return 1 - fi + fi ;; "core"|"admin"|"ftl") if [[ "$prev2" == "checkout" ]]; then diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 23836270..537e6724 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -1211,7 +1211,6 @@ setPrivacyLevel() { "1" "Hide domains" off "2" "Hide domains and clients" off "3" "Anonymous mode" off - "4" "Disabled statistics" off ) # Get the user's choice diff --git a/manpages/pihole-FTL.conf.5 b/manpages/pihole-FTL.conf.5 index 218f5e7a..5cb0481e 100644 --- a/manpages/pihole-FTL.conf.5 +++ b/manpages/pihole-FTL.conf.5 @@ -64,7 +64,7 @@ pihole-FTL.conf - FTL's config file On which port should FTL be listening? .br -\fBPRIVACYLEVEL=0|1|2|3|4\fR +\fBPRIVACYLEVEL=0|1|2|3\fR .br Which privacy level is used? .br @@ -76,8 +76,6 @@ pihole-FTL.conf - FTL's config file .br 3 - anonymous mode (hide everything) .br - 4 - disable all statistics -.br \fBIGNORE_LOCALHOST=no|yes\fR .br diff --git a/manpages/pihole.8 b/manpages/pihole.8 index e528bcde..a57eb05e 100644 --- a/manpages/pihole.8 +++ b/manpages/pihole.8 @@ -139,7 +139,7 @@ Available commands and options: -i, interface Specify dnsmasq's interface listening behavior .br -l, privacylevel Set privacy level - (0 = lowest, 4 = highest) + (0 = lowest, 3 = highest) .br \fB-c, chronometer\fR [options]