From 92042bfdc59ecb962eb42f935bb8c944ddde032e Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 5 Sep 2019 10:46:19 +0200 Subject: [PATCH] Add files via upload --- .../LittleSnitchNorwegianList.lsrules | 2 +- .../NordicFiltersDnsmasq.conf | 2 +- .../XYZPrepareFilters.py | 18 +++++++++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules b/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules index a2b446cb1..325457f66 100644 --- a/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules +++ b/NorwegianExperimentalList alternate versions/LittleSnitchNorwegianList.lsrules @@ -194,7 +194,7 @@ { "action": "deny", "process": "any", "remote-hosts": "userneeds.dk" }, { "action": "deny", "process": "any", "remote-hosts": "vansnorge.com" }, { "action": "deny", "process": "any", "remote-hosts": "vetscan.no" }, -{ "action": "deny", "process": "any", "remote-hosts": "vevlysingar.fo +{ "action": "deny", "process": "any", "remote-hosts": "vevlysingar.fo" }, { "action": "deny", "process": "any", "remote-hosts": "wausauorthopedics.com" }, { "action": "deny", "process": "any", "remote-hosts": "webclick.no" }, { "action": "deny", "process": "any", "remote-hosts": "webhotell.enivest.no" }, diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf b/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf index a35490cfe..bc974d58e 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf +++ b/NorwegianExperimentalList alternate versions/NordicFiltersDnsmasq.conf @@ -191,7 +191,7 @@ address=/um-bs.com/127.0.0.1 address=/userneeds.dk/127.0.0.1 address=/vansnorge.com/127.0.0.1 address=/vetscan.no/127.0.0.1 -address=/vevlysingar.fo +address=/vevlysingar.fo/127.0.0.1 address=/wausauorthopedics.com/127.0.0.1 address=/webclick.no/127.0.0.1 address=/webhotell.enivest.no/127.0.0.1 diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 721a68d94..804bc895e 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -814,7 +814,7 @@ def prepare_ls(lines) -> str: ) line = re.sub( - r"$(?<=\.com$)|(?<=\.no$)|(?<=\.dk$)|(?<=\.is$)|(?<=\.org$)|(?<=\.net$)|(?<=\.tc$)|(?<=\.it$)|(?<=\.online$)|(?<=\.top$)|(?<=\.tv$)|(?<=\.eu$)|(?<=\.us$)|(?<=\.info$)|(?<=\.club$)", + r"$(?<=\.com$)|(?<=\.no$)|(?<=\.dk$)|(?<=\.is$)|(?<=\.fo$)|(?<=\.gl$)|(?<=\.org$)|(?<=\.net$)|(?<=\.tc$)|(?<=\.it$)|(?<=\.online$)|(?<=\.top$)|(?<=\.tv$)|(?<=\.eu$)|(?<=\.us$)|(?<=\.info$)|(?<=\.club$)", "\" },", line ) @@ -870,7 +870,7 @@ def prepare_dnsmasq(lines) -> str: ) line = re.sub( - r"$(?<=\.com$)|(?<=\.no$)|(?<=\.dk$)|(?<=\.is$)|(?<=\.org$)|(?<=\.net$)|(?<=\.tc$)|(?<=\.it$)|(?<=\.online$)|(?<=\.top$)|(?<=\.tv$)|(?<=\.eu$)|(?<=\.us$)|(?<=\.info$)|(?<=\.club$)", + r"$(?<=\.com$)|(?<=\.no$)|(?<=\.dk$)|(?<=\.is$)|(?<=\.fo$)|(?<=\.gl$)|(?<=\.org$)|(?<=\.net$)|(?<=\.tc$)|(?<=\.it$)|(?<=\.online$)|(?<=\.top$)|(?<=\.tv$)|(?<=\.eu$)|(?<=\.us$)|(?<=\.info$)|(?<=\.club$)", "/127.0.0.1", line ) @@ -1400,6 +1400,18 @@ def prepare_tpl(lines) -> str: line ) + line = re.sub( + r"^- gdn$", + "", + line + ) + + line = re.sub( + r"^- bid$", + "", + line + ) + line = re.sub( r"^-d .*\*\..*", "", @@ -1766,7 +1778,7 @@ def prepare_agh(lines) -> str: line = re.sub( r"! Placeholder line.*", - "! Manually updated AdGuard Home version of the whitelisted domains from the other versions of this list.\n@@||coolcmd.tk^$important\n@@||budterence.tk^$important\n@@||intr0.tk^$important\n@@||google.tk^$important\n@@||transportnews.tk^$important\n@@||unicorncardlist.tk^$important\n@@||c0d3c.tk^$important\n@@||loljp-wiki.tk^$important\n@@|| ninetail.tk^$important\n@@|| goshujin.tk^$important\n@@|| graph.tk^$important\n@@||google.ga^$important\n@@||filtri-dns.ga^$important\n@@||google.ml^$important\n@@||deimos.gq^$important\n@@||1hos.cf^$important\n@@||intr0.cf^$important\n@@||ivoid.cd^$important\n@@||domainvoider.cf^$important\n@@||google.cf^$important\n@@||rths.cf^$important\n@@||anonytext.tk^$important\n@@||tokelau-info.tk^$important\n@@||fakaofo.tk^$important\n@@||nukunonu.tk^$important\n@@||anpigabon.ga^$important\n@@||dgdi.ga^$important\n@@||voitures.ga^$important\n@@||mobili.ml^$important\n@@||inege.gq^$important\n@@||tvgelive.gq^$important\n@@||comprarcarros.gq^$important\n@@||voitures.cf^$important\n@@||assembleenationale-rca.cf^$important\n@@||cps-rca.cf^$important\n@@||acap.cf^$important", + "! Manually updated AdGuard Home version of the whitelisted domains from the other versions of this list.\n@@||coolcmd.tk^$important\n@@||budterence.tk^$important\n@@||intr0.tk^$important\n@@||google.tk^$important\n@@||transportnews.tk^$important\n@@||unicorncardlist.tk^$important\n@@||c0d3c.tk^$important\n@@||loljp-wiki.tk^$important\n@@||ninetail.tk^$important\n@@||goshujin.tk^$important\n@@||graph.tk^$important\n@@||google.ga^$important\n@@||filtri-dns.ga^$important\n@@||google.ml^$important\n@@||deimos.gq^$important\n@@||1hos.cf^$important\n@@||intr0.cf^$important\n@@||ivoid.cd^$important\n@@||domainvoider.cf^$important\n@@||google.cf^$important\n@@||rths.cf^$important\n@@||anonytext.tk^$important\n@@||tokelau-info.tk^$important\n@@||fakaofo.tk^$important\n@@||nukunonu.tk^$important\n@@||anpigabon.ga^$important\n@@||dgdi.ga^$important\n@@||voitures.ga^$important\n@@||mobili.ml^$important\n@@||inege.gq^$important\n@@||tvgelive.gq^$important\n@@||comprarcarros.gq^$important\n@@||voitures.cf^$important\n@@||assembleenationale-rca.cf^$important\n@@||cps-rca.cf^$important\n@@||acap.cf^$important", line )