mirror of
https://gitea.blesmrt.net/mikaela/shell-things.git
synced 2024-11-10 02:29:22 +01:00
{firefox,chromium}: switch from AdNauseam to uBlock Origin
I love AdNauseam, but it's a tool for protests and it shows constantly, while uBlock Origin is more sysadmin-friendly deploying silently and not complaining about browser protection or PrivacyBadger etc.
This commit is contained in:
parent
b4a1da8423
commit
9b348b16cc
@ -5,42 +5,14 @@
|
|||||||
"adnauseam@rednoise.org": {
|
"adnauseam@rednoise.org": {
|
||||||
"toAdd": {
|
"toAdd": {
|
||||||
"trustedSiteDirectives": [
|
"trustedSiteDirectives": [
|
||||||
"app.element.io",
|
""
|
||||||
"staging.element.io",
|
|
||||||
"develop.element.io",
|
|
||||||
"chat.pikaviestin.fi",
|
|
||||||
"webchat.disroot.org",
|
|
||||||
"learn.microsoft.com",
|
|
||||||
"teams.microsoft.com",
|
|
||||||
"bittimittari.fi",
|
|
||||||
"pp-attester-turnstile.research.cloudflare.com",
|
|
||||||
"keyoxide.org",
|
|
||||||
"one.one.one.one",
|
|
||||||
"www.ecosia.org",
|
|
||||||
"ac.ecosia.org"
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"toOverwrite": {
|
"toOverwrite": {
|
||||||
"filterLists": [
|
"filterLists": [
|
||||||
"user-filters",
|
|
||||||
"ublock-filters",
|
|
||||||
"ublock-badware",
|
|
||||||
"ublock-privacy",
|
|
||||||
"ublock-abuse",
|
|
||||||
"ublock-unbreak",
|
|
||||||
"easylist",
|
"easylist",
|
||||||
"easyprivacy",
|
|
||||||
"urlhaus-1",
|
|
||||||
"plowe-0",
|
|
||||||
"https://gitea.blesmrt.net/mikaela/gist/raw/branch/master/DNS/blocklist.txt",
|
|
||||||
"adnauseam-filters",
|
"adnauseam-filters",
|
||||||
"eff-dnt-whitelist",
|
"eff-dnt-whitelist"
|
||||||
"ublock-quick-fixes",
|
|
||||||
"FIN-0",
|
|
||||||
"https://big.oisd.nl",
|
|
||||||
"ublock-annoyances",
|
|
||||||
"adguard-mobile-app-banners",
|
|
||||||
"curben-phishing"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -70,6 +42,46 @@
|
|||||||
},
|
},
|
||||||
"jid1-ZAdIEUB7XOzOJw@jetpack": {
|
"jid1-ZAdIEUB7XOzOJw@jetpack": {
|
||||||
"hasSeenPostInstall": true
|
"hasSeenPostInstall": true
|
||||||
|
},
|
||||||
|
"uBlock0@raymondhill.net": {
|
||||||
|
"toAdd": {
|
||||||
|
"trustedSiteDirectives": [
|
||||||
|
"app.element.io",
|
||||||
|
"staging.element.io",
|
||||||
|
"develop.element.io",
|
||||||
|
"chat.pikaviestin.fi",
|
||||||
|
"webchat.disroot.org",
|
||||||
|
"learn.microsoft.com",
|
||||||
|
"teams.microsoft.com",
|
||||||
|
"bittimittari.fi",
|
||||||
|
"pp-attester-turnstile.research.cloudflare.com",
|
||||||
|
"keyoxide.org",
|
||||||
|
"one.one.one.one",
|
||||||
|
"www.ecosia.org",
|
||||||
|
"ac.ecosia.org"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"toOverwrite": {
|
||||||
|
"filterLists": [
|
||||||
|
"user-filters",
|
||||||
|
"ublock-filters",
|
||||||
|
"ublock-badware",
|
||||||
|
"ublock-privacy",
|
||||||
|
"ublock-abuse",
|
||||||
|
"ublock-unbreak",
|
||||||
|
"easylist",
|
||||||
|
"easyprivacy",
|
||||||
|
"urlhaus-1",
|
||||||
|
"plowe-0",
|
||||||
|
"https://www.eff.org/files/effdntlist.txt",
|
||||||
|
"https://gitea.blesmrt.net/mikaela/gist/raw/branch/master/DNS/blocklist.txt",
|
||||||
|
"ublock-quick-fixes",
|
||||||
|
"FIN-0",
|
||||||
|
"https://big.oisd.nl",
|
||||||
|
"ublock-annoyances",
|
||||||
|
"adguard-mobile-app-banners"
|
||||||
|
]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -142,7 +154,7 @@
|
|||||||
},
|
},
|
||||||
"adnauseam@rednoise.org": {
|
"adnauseam@rednoise.org": {
|
||||||
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/adnauseam/latest.xpi",
|
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/adnauseam/latest.xpi",
|
||||||
"installation_mode": "force_installed"
|
"installation_mode": "blocked"
|
||||||
},
|
},
|
||||||
"ipvfoobar@napr.eu": {
|
"ipvfoobar@napr.eu": {
|
||||||
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/ipvfoobar/latest.xpi",
|
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/ipvfoobar/latest.xpi",
|
||||||
@ -166,10 +178,11 @@
|
|||||||
},
|
},
|
||||||
"uBlock0@raymondhill.net": {
|
"uBlock0@raymondhill.net": {
|
||||||
"blocked_install_message": "uBlock Origin on integroitu AdNauseamiin, joka on forkki siitä.",
|
"blocked_install_message": "uBlock Origin on integroitu AdNauseamiin, joka on forkki siitä.",
|
||||||
"installation_mode": "blocked"
|
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi",
|
||||||
|
"installation_mode": "force_installed"
|
||||||
},
|
},
|
||||||
"uMatrix@raymondhill.net": {
|
"uMatrix@raymondhill.net": {
|
||||||
"blocked_install_message": "uMatrixin kehitys on päättynyt ja samat ominaisuudet löytyvät AdNauseamista (ja uBlock Originista).",
|
"blocked_install_message": "uMatrixin kehitys on päättynyt ja samat ominaisuudet löytyvät uBlock Originista (ja AdNauseamista).",
|
||||||
"installation_mode": "blocked"
|
"installation_mode": "blocked"
|
||||||
},
|
},
|
||||||
"wayback_machine@mozilla.org": {
|
"wayback_machine@mozilla.org": {
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
"caoacbimdbbljakfhgikoodekdnlcgpk": {
|
"caoacbimdbbljakfhgikoodekdnlcgpk": {
|
||||||
"hasSeenPostInstall": true
|
"hasSeenPostInstall": true
|
||||||
},
|
},
|
||||||
"mlojlfildnehdpnlmpkeiiglhhkofhpb": {
|
"cjpalhdlnbpafiamejdnhcphjbkeiagm": {
|
||||||
"toAdd": {
|
"toAdd": {
|
||||||
"trustedSiteDirectives": [
|
"trustedSiteDirectives": [
|
||||||
"app.element.io",
|
"app.element.io",
|
||||||
@ -37,15 +37,27 @@
|
|||||||
"easyprivacy",
|
"easyprivacy",
|
||||||
"urlhaus-1",
|
"urlhaus-1",
|
||||||
"plowe-0",
|
"plowe-0",
|
||||||
|
"https://www.eff.org/files/effdntlist.txt",
|
||||||
"https://gitea.blesmrt.net/mikaela/gist/raw/branch/master/DNS/blocklist.txt",
|
"https://gitea.blesmrt.net/mikaela/gist/raw/branch/master/DNS/blocklist.txt",
|
||||||
"adnauseam-filters",
|
|
||||||
"eff-dnt-whitelist",
|
|
||||||
"ublock-quick-fixes",
|
"ublock-quick-fixes",
|
||||||
"FIN-0",
|
"FIN-0",
|
||||||
"https://big.oisd.nl",
|
"https://big.oisd.nl",
|
||||||
"ublock-annoyances",
|
"ublock-annoyances",
|
||||||
"adguard-mobile-app-banners",
|
"adguard-mobile-app-banners"
|
||||||
"curben-phishing"
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"mlojlfildnehdpnlmpkeiiglhhkofhpb": {
|
||||||
|
"toAdd": {
|
||||||
|
"trustedSiteDirectives": [
|
||||||
|
""
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"toOverwrite": {
|
||||||
|
"filterLists": [
|
||||||
|
"easylist",
|
||||||
|
"adnauseam-filters",
|
||||||
|
"eff-dnt-whitelist"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -90,8 +102,10 @@
|
|||||||
"update_url": "https://clients2.google.com/service/update2/crx"
|
"update_url": "https://clients2.google.com/service/update2/crx"
|
||||||
},
|
},
|
||||||
"cjpalhdlnbpafiamejdnhcphjbkeiagm": {
|
"cjpalhdlnbpafiamejdnhcphjbkeiagm": {
|
||||||
"blocked_install_message": "uBlock Origin on integroitu AdNauseamiin, joka on forkki siitä.",
|
"installation_mode": "force_installed",
|
||||||
"installation_mode": "blocked"
|
"override_update_url": true,
|
||||||
|
"toolbar_pin": "force_pinned",
|
||||||
|
"update_url": "https://clients2.google.com/service/update2/crx"
|
||||||
},
|
},
|
||||||
"donbcfbmhbcapadipfkeojnmajbakjdc": {
|
"donbcfbmhbcapadipfkeojnmajbakjdc": {
|
||||||
"installation_mode": "normal_installed",
|
"installation_mode": "normal_installed",
|
||||||
@ -118,7 +132,8 @@
|
|||||||
"update_url": "https://clients2.google.com/service/update2/crx"
|
"update_url": "https://clients2.google.com/service/update2/crx"
|
||||||
},
|
},
|
||||||
"mlojlfildnehdpnlmpkeiiglhhkofhpb": {
|
"mlojlfildnehdpnlmpkeiiglhhkofhpb": {
|
||||||
"installation_mode": "force_installed",
|
"blocked_install_message": "AdNauseam on protestityökalu, kun taas Aminda yrittää olla sysadmin.",
|
||||||
|
"installation_mode": "blocked",
|
||||||
"override_update_url": true,
|
"override_update_url": true,
|
||||||
"toolbar_pin": "force_pinned",
|
"toolbar_pin": "force_pinned",
|
||||||
"update_url": "https://edge.microsoft.com/extensionwebstorebase/v1/crx"
|
"update_url": "https://edge.microsoft.com/extensionwebstorebase/v1/crx"
|
||||||
@ -130,7 +145,7 @@
|
|||||||
"update_url": "https://clients2.google.com/service/update2/crx"
|
"update_url": "https://clients2.google.com/service/update2/crx"
|
||||||
},
|
},
|
||||||
"odfafepnkmbhccpbejgmiehpchacaeak": {
|
"odfafepnkmbhccpbejgmiehpchacaeak": {
|
||||||
"blocked_install_message": "uBlock Origin on integroitu AdNauseamiin, joka on forkki siitä.",
|
"blocked_install_message": "uBlock Origin pitäisi olla jo asennettu Chrome-kaupasta.",
|
||||||
"installation_mode": "blocked"
|
"installation_mode": "blocked"
|
||||||
},
|
},
|
||||||
"pkehgijcmpdhfbdbbnkijodmdjhbjlgp": {
|
"pkehgijcmpdhfbdbbnkijodmdjhbjlgp": {
|
||||||
|
Loading…
Reference in New Issue
Block a user