diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersForMinerBlock.txt b/NorwegianExperimentalList alternate versions/NordicFiltersForMinerBlock.txt index e5d77b681..9e6fc216b 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersForMinerBlock.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersForMinerBlock.txt @@ -254,7 +254,7 @@ Note: This list does not actually block any mining-related stuff. *://*.norwegian.com.*/* *://*.flysas-no.*/* *://*.tusenfryd-com.*/* -*.gratis-reisebilletter.* +*://*.*.gratis-reisebilletter.*/* *://*.paypal.*.no/* *://*.kiwi.com-*/* *://*.kongeparken.com-*/* diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersRPZ.txt b/NorwegianExperimentalList alternate versions/NordicFiltersRPZ.txt index ea6268a09..d47c21975 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersRPZ.txt +++ b/NorwegianExperimentalList alternate versions/NordicFiltersRPZ.txt @@ -253,7 +253,7 @@ skatteetaten.no.* CNAME . norwegian.com.* CNAME . flysas-no.* CNAME . tusenfryd-com.* CNAME . -*.gratis-reisebilletter.* +*.gratis-reisebilletter.* CNAME . paypal.*.no CNAME . kiwi.com-* CNAME . kongeparken.com-* CNAME . diff --git a/NorwegianExperimentalList alternate versions/NordicFiltersUnbound.conf b/NorwegianExperimentalList alternate versions/NordicFiltersUnbound.conf index daefd1756..e6559841b 100644 --- a/NorwegianExperimentalList alternate versions/NordicFiltersUnbound.conf +++ b/NorwegianExperimentalList alternate versions/NordicFiltersUnbound.conf @@ -253,7 +253,7 @@ local-zone: "skatteetaten.no.*" static local-zone: "norwegian.com.*" static local-zone: "flysas-no.*" static local-zone: "tusenfryd-com.*" static -*.gratis-reisebilletter.* +local-zone: "*.gratis-reisebilletter.*" static local-zone: "paypal.*.no" static local-zone: "kiwi.com-*" static local-zone: "kongeparken.com-*" static diff --git a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py index 67c510a8c..bd30db402 100644 --- a/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py +++ b/NorwegianExperimentalList alternate versions/XYZPrepareFilters.py @@ -1605,7 +1605,7 @@ def prepare_rpz(lines) -> str: ) line = re.sub( - r"^([a-z0-9].*)", + r"^([a-z0-9*].*)", r"\1 CNAME .", line ) @@ -1652,7 +1652,7 @@ def prepare_unbound(lines) -> str: ) line = re.sub( - r"^([a-z0-9].*)", + r"^([a-z0-9*].*)", r"local-zone: \"\1\" static", line ) @@ -1699,7 +1699,7 @@ def prepare_minerblock(lines) -> str: ) line = re.sub( - r"^([a-z0-9].*)", + r"^([a-z0-9*].*)", r"*://*.\1/*", line )