Update lists

Fix converting to mikrotik script

.github/workflows/create-lists.yml

@@ -31,7 +31,7 @@ jobs:
         -v ${{ github.workspace }}/Services:/app/Services \
         -v ${{ github.workspace }}/SRS:/app/SRS \
         -v ${{ github.workspace }}/DAT:/app/DAT \
-        itdoginfo/compilesrs:0.1.12
+        itdoginfo/compilesrs:0.1.13
 
     - name: Check Russia/inside-dnsmasq-ipset
       uses: itdoginfo/dnsmasq-action@0.1

Categories/block.lst

@@ -236,4 +236,8 @@ chess.com
 forum.netgate.com
 botnadzor.org
 ef.com
-ef.edu
+ef.edu
+sci-hub.se
+sci-hub.st
+booth.pm
+booth.pximg.net

Categories/geoblock.lst

@@ -290,4 +290,7 @@ mattermost.com
 sentry.io
 torrenteditor.com
 ntp.msn.com
-oracle.com
+oracle.com
+etsy.com
+myheritage.com
+mssg.me

Russia/inside-clashx.lst

@@ -80,6 +80,8 @@ DOMAIN-SUFFIX,blackseanews.net
 DOMAIN-SUFFIX,blinkshot.io
 DOMAIN-SUFFIX,bluehost.com
 DOMAIN-SUFFIX,booktracker.org
+DOMAIN-SUFFIX,booth.pm
+DOMAIN-SUFFIX,booth.pximg.net
 DOMAIN-SUFFIX,botnadzor.org
 DOMAIN-SUFFIX,brawlstarsgame.com
 DOMAIN-SUFFIX,broadcom.com
@@ -206,6 +208,7 @@ DOMAIN-SUFFIX,ekhokavkaza.com
 DOMAIN-SUFFIX,element14.com
 DOMAIN-SUFFIX,elevenlabs.io
 DOMAIN-SUFFIX,epidemz.net.co
+DOMAIN-SUFFIX,etsy.com
 DOMAIN-SUFFIX,euronews.com
 DOMAIN-SUFFIX,euroradio.fm
 DOMAIN-SUFFIX,eutrp.eu
@@ -422,11 +425,13 @@ DOMAIN-SUFFIX,mongodb.com
 DOMAIN-SUFFIX,monoprice.com
 DOMAIN-SUFFIX,more.fm
 DOMAIN-SUFFIX,mouser.fi
+DOMAIN-SUFFIX,mssg.me
 DOMAIN-SUFFIX,mullvad.net
 DOMAIN-SUFFIX,multporn.net
 DOMAIN-SUFFIX,muscdn.com
 DOMAIN-SUFFIX,musical.ly
 DOMAIN-SUFFIX,mydoramy.club
+DOMAIN-SUFFIX,myheritage.com
 DOMAIN-SUFFIX,myjetbrains.com
 DOMAIN-SUFFIX,navalny.com
 DOMAIN-SUFFIX,nba.com
@@ -599,6 +604,8 @@ DOMAIN-SUFFIX,salesforceiq.com
 DOMAIN-SUFFIX,salesforceliveagent.com
 DOMAIN-SUFFIX,sap.com
 DOMAIN-SUFFIX,saverudata.net
+DOMAIN-SUFFIX,sci-hub.se
+DOMAIN-SUFFIX,sci-hub.st
 DOMAIN-SUFFIX,sdxcentral.com
 DOMAIN-SUFFIX,seasonvar.ru
 DOMAIN-SUFFIX,selezen.org

Russia/inside-dnsmasq-ipset.lst

@@ -80,6 +80,8 @@ ipset=/blackseanews.net/vpn_domains
 ipset=/blinkshot.io/vpn_domains
 ipset=/bluehost.com/vpn_domains
 ipset=/booktracker.org/vpn_domains
+ipset=/booth.pm/vpn_domains
+ipset=/booth.pximg.net/vpn_domains
 ipset=/botnadzor.org/vpn_domains
 ipset=/brawlstarsgame.com/vpn_domains
 ipset=/broadcom.com/vpn_domains
@@ -206,6 +208,7 @@ ipset=/ekhokavkaza.com/vpn_domains
 ipset=/element14.com/vpn_domains
 ipset=/elevenlabs.io/vpn_domains
 ipset=/epidemz.net.co/vpn_domains
+ipset=/etsy.com/vpn_domains
 ipset=/euronews.com/vpn_domains
 ipset=/euroradio.fm/vpn_domains
 ipset=/eutrp.eu/vpn_domains
@@ -422,11 +425,13 @@ ipset=/mongodb.com/vpn_domains
 ipset=/monoprice.com/vpn_domains
 ipset=/more.fm/vpn_domains
 ipset=/mouser.fi/vpn_domains
+ipset=/mssg.me/vpn_domains
 ipset=/mullvad.net/vpn_domains
 ipset=/multporn.net/vpn_domains
 ipset=/muscdn.com/vpn_domains
 ipset=/musical.ly/vpn_domains
 ipset=/mydoramy.club/vpn_domains
+ipset=/myheritage.com/vpn_domains
 ipset=/myjetbrains.com/vpn_domains
 ipset=/navalny.com/vpn_domains
 ipset=/nba.com/vpn_domains
@@ -599,6 +604,8 @@ ipset=/salesforceiq.com/vpn_domains
 ipset=/salesforceliveagent.com/vpn_domains
 ipset=/sap.com/vpn_domains
 ipset=/saverudata.net/vpn_domains
+ipset=/sci-hub.se/vpn_domains
+ipset=/sci-hub.st/vpn_domains
 ipset=/sdxcentral.com/vpn_domains
 ipset=/seasonvar.ru/vpn_domains
 ipset=/selezen.org/vpn_domains

Russia/inside-dnsmasq-nfset.lst

@@ -80,6 +80,8 @@ nftset=/blackseanews.net/4#inet#fw4#vpn_domains
 nftset=/blinkshot.io/4#inet#fw4#vpn_domains
 nftset=/bluehost.com/4#inet#fw4#vpn_domains
 nftset=/booktracker.org/4#inet#fw4#vpn_domains
+nftset=/booth.pm/4#inet#fw4#vpn_domains
+nftset=/booth.pximg.net/4#inet#fw4#vpn_domains
 nftset=/botnadzor.org/4#inet#fw4#vpn_domains
 nftset=/brawlstarsgame.com/4#inet#fw4#vpn_domains
 nftset=/broadcom.com/4#inet#fw4#vpn_domains
@@ -206,6 +208,7 @@ nftset=/ekhokavkaza.com/4#inet#fw4#vpn_domains
 nftset=/element14.com/4#inet#fw4#vpn_domains
 nftset=/elevenlabs.io/4#inet#fw4#vpn_domains
 nftset=/epidemz.net.co/4#inet#fw4#vpn_domains
+nftset=/etsy.com/4#inet#fw4#vpn_domains
 nftset=/euronews.com/4#inet#fw4#vpn_domains
 nftset=/euroradio.fm/4#inet#fw4#vpn_domains
 nftset=/eutrp.eu/4#inet#fw4#vpn_domains
@@ -422,11 +425,13 @@ nftset=/mongodb.com/4#inet#fw4#vpn_domains
 nftset=/monoprice.com/4#inet#fw4#vpn_domains
 nftset=/more.fm/4#inet#fw4#vpn_domains
 nftset=/mouser.fi/4#inet#fw4#vpn_domains
+nftset=/mssg.me/4#inet#fw4#vpn_domains
 nftset=/mullvad.net/4#inet#fw4#vpn_domains
 nftset=/multporn.net/4#inet#fw4#vpn_domains
 nftset=/muscdn.com/4#inet#fw4#vpn_domains
 nftset=/musical.ly/4#inet#fw4#vpn_domains
 nftset=/mydoramy.club/4#inet#fw4#vpn_domains
+nftset=/myheritage.com/4#inet#fw4#vpn_domains
 nftset=/myjetbrains.com/4#inet#fw4#vpn_domains
 nftset=/navalny.com/4#inet#fw4#vpn_domains
 nftset=/nba.com/4#inet#fw4#vpn_domains
@@ -599,6 +604,8 @@ nftset=/salesforceiq.com/4#inet#fw4#vpn_domains
 nftset=/salesforceliveagent.com/4#inet#fw4#vpn_domains
 nftset=/sap.com/4#inet#fw4#vpn_domains
 nftset=/saverudata.net/4#inet#fw4#vpn_domains
+nftset=/sci-hub.se/4#inet#fw4#vpn_domains
+nftset=/sci-hub.st/4#inet#fw4#vpn_domains
 nftset=/sdxcentral.com/4#inet#fw4#vpn_domains
 nftset=/seasonvar.ru/4#inet#fw4#vpn_domains
 nftset=/selezen.org/4#inet#fw4#vpn_domains

Russia/inside-kvas.lst

@@ -79,6 +79,8 @@ blackseanews.net
 blinkshot.io
 bluehost.com
 booktracker.org
+booth.pm
+booth.pximg.net
 botnadzor.org
 brawlstarsgame.com
 broadcom.com
@@ -205,6 +207,7 @@ ekhokavkaza.com
 element14.com
 elevenlabs.io
 epidemz.net.co
+etsy.com
 euronews.com
 euroradio.fm
 eutrp.eu
@@ -421,11 +424,13 @@ mongodb.com
 monoprice.com
 more.fm
 mouser.fi
+mssg.me
 mullvad.net
 multporn.net
 muscdn.com
 musical.ly
 mydoramy.club
+myheritage.com
 myjetbrains.com
 navalny.com
 nba.com
@@ -598,6 +603,8 @@ salesforceiq.com
 salesforceliveagent.com
 sap.com
 saverudata.net
+sci-hub.se
+sci-hub.st
 sdxcentral.com
 seasonvar.ru
 selezen.org

Russia/inside-mikrotik-fwd.lst

@@ -1,4 +1,4 @@
-/ip dns static add name=.ua type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
+/ip dns static add name=*.ua type=FWD address-list=allow-domains forward-to=localhost
 /ip dns static add name=10minutemail.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=1337x.to type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=24.kg type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
@@ -80,6 +80,8 @@
 /ip dns static add name=blinkshot.io type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=bluehost.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=booktracker.org type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
+/ip dns static add name=booth.pm type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
+/ip dns static add name=booth.pximg.net type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=botnadzor.org type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=brawlstarsgame.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=broadcom.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
@@ -206,6 +208,7 @@
 /ip dns static add name=element14.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=elevenlabs.io type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=epidemz.net.co type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
+/ip dns static add name=etsy.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=euronews.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=euroradio.fm type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=eutrp.eu type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
@@ -422,11 +425,13 @@
 /ip dns static add name=monoprice.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=more.fm type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=mouser.fi type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
+/ip dns static add name=mssg.me type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=mullvad.net type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=multporn.net type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=muscdn.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=musical.ly type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=mydoramy.club type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
+/ip dns static add name=myheritage.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=myjetbrains.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=navalny.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=nba.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
@@ -599,6 +604,8 @@
 /ip dns static add name=salesforceliveagent.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=sap.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=saverudata.net type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
+/ip dns static add name=sci-hub.se type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
+/ip dns static add name=sci-hub.st type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=sdxcentral.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=seasonvar.ru type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=selezen.org type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
@@ -612,7 +619,6 @@
 /ip dns static add name=shinyhardware.co.uk type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=shiza-project.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=shop.gameloft.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
-/ip dns static add name=showip.net type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=sibreal.org type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=signal.org type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=simplex.chat type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost

Russia/inside-raw.lst

@@ -80,6 +80,8 @@ blackseanews.net
 blinkshot.io
 bluehost.com
 booktracker.org
+booth.pm
+booth.pximg.net
 botnadzor.org
 brawlstarsgame.com
 broadcom.com
@@ -206,6 +208,7 @@ ekhokavkaza.com
 element14.com
 elevenlabs.io
 epidemz.net.co
+etsy.com
 euronews.com
 euroradio.fm
 eutrp.eu
@@ -422,11 +425,13 @@ mongodb.com
 monoprice.com
 more.fm
 mouser.fi
+mssg.me
 mullvad.net
 multporn.net
 muscdn.com
 musical.ly
 mydoramy.club
+myheritage.com
 myjetbrains.com
 navalny.com
 nba.com
@@ -599,6 +604,8 @@ salesforceiq.com
 salesforceliveagent.com
 sap.com
 saverudata.net
+sci-hub.se
+sci-hub.st
 sdxcentral.com
 seasonvar.ru
 selezen.org

Ukraine/inside-mikrotik-fwd.lst

@@ -1,7 +1,7 @@
-/ip dns static add name=.com.by type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
-/ip dns static add name=.gov.by type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
-/ip dns static add name=.mil.by type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
-/ip dns static add name=.of.by type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
+/ip dns static add name=*.com.by type=FWD address-list=allow-domains forward-to=localhost
+/ip dns static add name=*.gov.by type=FWD address-list=allow-domains forward-to=localhost
+/ip dns static add name=*.mil.by type=FWD address-list=allow-domains forward-to=localhost
+/ip dns static add name=*.of.by type=FWD address-list=allow-domains forward-to=localhost
 /ip dns static add name=0.ru type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=0370.ru type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=08k.ru type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost

convert.py

@@ -168,7 +168,10 @@ def mikrotik_fwd(src, out, remove={'google.com'}):
 
     with open(f'{out}-mikrotik-fwd.lst', 'w') as file:
         for name in domains:
-            file.write(f'/ip dns static add name={name} type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost\n')
+            if name.startswith('.'):
+                file.write(f'/ip dns static add name=*.{name[1:]} type=FWD address-list=allow-domains forward-to=localhost\n')
+            else:
+                file.write(f'/ip dns static add name={name} type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost\n')
 
 def domains_from_file(filepath):
     domains = []
@@ -396,6 +399,7 @@ if __name__ == '__main__':
     Path("Russia").mkdir(parents=True, exist_ok=True)
 
     removeDomains = {'google.com', 'googletagmanager.com', 'github.com', 'githubusercontent.com', 'githubcopilot.com', 'microsoft.com', 'cloudflare-dns.com', 'parsec.app' }
+    removeDomainsMikrotik = {'google.com', 'googletagmanager.com', 'github.com', 'githubusercontent.com', 'githubcopilot.com', 'microsoft.com', 'cloudflare-dns.com', 'parsec.app', 'showip.net' }
     removeDomainsKvas = {'google.com', 'googletagmanager.com', 'github.com', 'githubusercontent.com', 'githubcopilot.com', 'microsoft.com', 'cloudflare-dns.com', 'parsec.app', 't.co', 'ua' }
     
     inside_lists = [rusDomainsInsideCategories, rusDomainsInsideServices]
@@ -404,7 +408,7 @@ if __name__ == '__main__':
     dnsmasq(inside_lists, rusDomainsInsideOut, removeDomains)
     clashx(inside_lists, rusDomainsInsideOut, removeDomains)
     kvas(inside_lists, rusDomainsInsideOut, removeDomainsKvas)
-    mikrotik_fwd(inside_lists, rusDomainsInsideOut, removeDomains)
+    mikrotik_fwd(inside_lists, rusDomainsInsideOut, removeDomainsMikrotik)
 
     # Russia outside
     outside_lists = [rusDomainsOutsideSrc]