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 references to Disconnect category and fastblock lists #60

Merged
merged 2 commits into from
Mar 19, 2020
Merged

Remove references to Disconnect category and fastblock lists #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3eb4675
Remove references to Disconnect category
boolean5 Mar 17, 2020
15ecfee
Remove references to outdated fastblock lists
boolean5 Mar 17, 2020
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
35 changes: 5 additions & 30 deletions prod.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,21 @@ s3_key=tracking/contentw3c-track-digest256

# DNT="", ads category
[tracking-protection-ads]
categories=Advertising|Disconnect
categories=Advertising
output=ads-track-digest256
s3_key=tracking/ads-track-digest256
versioning_needed=true

# DNT="", analytics category
[tracking-protection-analytics]
categories=Analytics|Disconnect
categories=Analytics
output=analytics-track-digest256
s3_key=tracking/analytics-track-digest256
versioning_needed=true

# DNT="", social category
[tracking-protection-social]
categories=Social|Disconnect
categories=Social
output=social-track-digest256
s3_key=tracking/social-track-digest256
versioning_needed=true
Expand Down Expand Up @@ -112,7 +112,7 @@ output=mozstd-track-digest256
s3_key=tracking/mozstd-track-digest256

[tracking-protection-full]
categories=Advertising|Analytics|Social|Disconnect|Content
categories=Advertising|Analytics|Social|Content
output=mozfull-track-digest256
s3_key=tracking/mozfull-track-digest256

Expand Down Expand Up @@ -171,35 +171,10 @@ output=mozstdstaging-track-digest256
s3_key=tracking/mozstdstaging-track-digest256

[staging-tracking-protection-full]
categories=Advertising|Analytics|Social|Disconnect|Content
categories=Advertising|Analytics|Social|Content
output=mozfullstaging-track-digest256
s3_key=tracking/mozfullstaging-track-digest256

[fastblock1]
blocklist_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock1.json
output=fastblock1-track-digest256
s3_key=fastblock/fastblock1-track-digest256

[fastblock1-whitelist]
entity_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock1-whitelist.json
output=fastblock1-trackwhite-digest256
s3_key=fastblock/fastblock1-trackwhite-digest256

[fastblock2]
blocklist_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock2.json
output=fastblock2-track-digest256
s3_key=fastblock/fastblock2-track-digest256

[fastblock2-whitelist]
entity_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock2-whitelist.json
output=fastblock2-trackwhite-digest256
s3_key=fastblock/fastblock2-trackwhite-digest256

[fastblock3]
blocklist_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock3.json
output=fastblock3-track-digest256
s3_key=fastblock/fastblock3-track-digest256

[tracking-protection-base-fingerprinting]
categories=Advertising|Analytics|Social|Content,Fingerprinting
output=base-fingerprinting-track-digest256
Expand Down
36 changes: 5 additions & 31 deletions stage.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,22 @@ s3_key=tracking/contentw3c-track-digest256

# DNT="", ads category
[tracking-protection-ads]
categories=Advertising|Disconnect
categories=Advertising
output=ads-track-digest256
s3_key=tracking/ads-track-digest256
versioning_needed=true

# DNT="", analytics category
[tracking-protection-analytics]
categories=Analytics|Disconnect
categories=Analytics
output=analytics-track-digest256
s3_key=tracking/analytics-track-digest256
versioning_needed=true

# DNT="", social category
# NOTE: This is the *Disconnect* Social category; not the same as STP below
[tracking-protection-social]
categories=Social|Disconnect
categories=Social
output=social-track-digest256
s3_key=tracking/social-track-digest256
versioning_needed=true
Expand Down Expand Up @@ -124,7 +124,7 @@ output=mozstd-track-digest256
s3_key=tracking/mozstd-track-digest256

[tracking-protection-full]
categories=Advertising|Analytics|Social|Disconnect|Content
categories=Advertising|Analytics|Social|Content
output=mozfull-track-digest256
s3_key=tracking/mozfull-track-digest256

Expand Down Expand Up @@ -184,36 +184,10 @@ output=mozstdstaging-track-digest256
s3_key=tracking/mozstdstaging-track-digest256

[staging-tracking-protection-full]
categories=Advertising|Analytics|Social|Disconnect|Content
categories=Advertising|Analytics|Social|Content
output=mozfullstaging-track-digest256
s3_key=tracking/mozfullstaging-track-digest256

[fastblock1]
blocklist_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock1.json
output=fastblock1-track-digest256
s3_key=fastblock/fastblock1-track-digest256

[fastblock1-whitelist]
entity_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock1-whitelist.json
output=fastblock1-trackwhite-digest256
s3_key=fastblock/fastblock1-trackwhite-digest256

[fastblock2]
blocklist_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock2.json
output=fastblock2-track-digest256
s3_key=fastblock/fastblock2-track-digest256

[fastblock2-whitelist]
entity_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock2-whitelist.json
output=fastblock2-trackwhite-digest256
s3_key=fastblock/fastblock2-trackwhite-digest256
remote_settings_upload=true

[fastblock3]
blocklist_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock3.json
output=fastblock3-track-digest256
s3_key=fastblock/fastblock3-track-digest256

[tracking-protection-base-fingerprinting]
categories=Advertising|Analytics|Social|Content,Fingerprinting
output=base-fingerprinting-track-digest256
Expand Down