Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove deprecated Disconnect lists from "defaults" #3451

Merged
merged 1 commit into from May 27, 2020
Merged

Remove deprecated Disconnect lists from "defaults" #3451

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions automated install/basic-install.sh
View file
Open in desktop
Expand Up @@ -1217,9 +1217,7 @@ chooseBlocklists() {
cmd=(whiptail --separate-output --checklist "Pi-hole relies on third party lists in order to block ads.\\n\\nYou can use the suggestions below, and/or add your own after installation\\n\\nTo deselect any list, use the arrow keys and spacebar" "${r}" "${c}" 5)
# In an array, show the options available (all off by default):
options=(StevenBlack "StevenBlack's Unified Hosts List" on
MalwareDom "MalwareDomains" on
DisconTrack "Disconnect.me Tracking" on
DisconAd "Disconnect.me Ads" on)
MalwareDom "MalwareDomains" on)

# In a variable, show the choices available; exit if Cancel is selected
choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty) || { printf " %bCancel was selected, exiting installer%b\\n" "${COL_LIGHT_RED}" "${COL_NC}"; rm "${adlistFile}" ;exit 1; }
Expand All @@ -1240,8 +1238,6 @@ appendToListsFile() {
case $1 in
StevenBlack ) echo "https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts" >> "${adlistFile}";;
MalwareDom ) echo "https://mirror1.malwaredomains.com/files/justdomains" >> "${adlistFile}";;
DisconTrack ) echo "https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt" >> "${adlistFile}";;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are both lists deprecated? Just wondering :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per the response from disconnect.me to the op of #3450

The list you referenced was used in our legacy products. It is not maintained, has not been updated, and is not actively distributed us. Airbrake is not included on our main tracker list (linked below) which is used by partners such as Firefox.

https://github.com/disconnectme/disconnect-tracking-protection/blob/master/services.json

I'm making the reasonable assumption that both lists are no longer updated/distributed. Besides which, when removed only 337 domains are "lost" from an install that has all lists selected.

DisconAd ) echo "https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt" >> "${adlistFile}";;
esac
}

Expand Down