Compare commits

...

7 Commits

Author SHA1 Message Date
GitHub Action
bc0f7b6277 Update lists 2025-02-17 08:44:14 +00:00
itdoginfo
9755a56967 Fix telegram name for srs 2025-02-13 11:53:15 +03:00
GitHub Action
0667ea32ca Update lists 2025-02-11 16:23:54 +00:00
itdoginfo
7289dfaa46 Sing-box to 1.11.3 2025-02-11 19:23:19 +03:00
itdoginfo
117632f692 Update tag 2025-02-11 19:22:54 +03:00
itdoginfo
793bb265ae Update srs version to 3 2025-02-11 19:20:50 +03:00
itdoginfo
94a5d8fccd Update 2025-02-11 19:17:28 +03:00
18 changed files with 36932 additions and 11 deletions

View File

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

View File

@@ -234,4 +234,5 @@ medium.com
navalny.com navalny.com
nih.gov nih.gov
omv-extras.org omv-extras.org
seasonvar.ru seasonvar.ru
bestchange.ru

View File

@@ -258,4 +258,5 @@ cisco.com
fluke.com fluke.com
iherb.com iherb.com
spotify.com spotify.com
weather.com weather.com
typing.com

View File

@@ -35,6 +35,7 @@ kavkazr.com
svoboda.org svoboda.org
bbc.com bbc.com
bbc.co.uk bbc.co.uk
bbci.co.uk
freemedia.io freemedia.io
dw.com dw.com
idelreal.org idelreal.org

View File

@@ -1,4 +1,4 @@
FROM ghcr.io/sagernet/sing-box:v1.10.7 AS sing-box FROM ghcr.io/sagernet/sing-box:v1.11.3 AS sing-box
FROM golang:1.22.12-alpine3.21 AS go-builder FROM golang:1.22.12-alpine3.21 AS go-builder

View File

@@ -66,10 +66,12 @@ DOMAIN-SUFFIX,baikal-journal.ru
DOMAIN-SUFFIX,bato.to DOMAIN-SUFFIX,bato.to
DOMAIN-SUFFIX,bbc.co.uk DOMAIN-SUFFIX,bbc.co.uk
DOMAIN-SUFFIX,bbc.com DOMAIN-SUFFIX,bbc.com
DOMAIN-SUFFIX,bbci.co.uk
DOMAIN-SUFFIX,bcbits.com DOMAIN-SUFFIX,bcbits.com
DOMAIN-SUFFIX,bell-sw.com DOMAIN-SUFFIX,bell-sw.com
DOMAIN-SUFFIX,bellingcat.com DOMAIN-SUFFIX,bellingcat.com
DOMAIN-SUFFIX,bestbuy.com DOMAIN-SUFFIX,bestbuy.com
DOMAIN-SUFFIX,bestchange.ru
DOMAIN-SUFFIX,bihus.info DOMAIN-SUFFIX,bihus.info
DOMAIN-SUFFIX,bitdefender.com DOMAIN-SUFFIX,bitdefender.com
DOMAIN-SUFFIX,blackseanews.net DOMAIN-SUFFIX,blackseanews.net
@@ -700,6 +702,7 @@ DOMAIN-SUFFIX,twtrdns.net
DOMAIN-SUFFIX,twttr.com DOMAIN-SUFFIX,twttr.com
DOMAIN-SUFFIX,twttr.net DOMAIN-SUFFIX,twttr.net
DOMAIN-SUFFIX,twvid.com DOMAIN-SUFFIX,twvid.com
DOMAIN-SUFFIX,typing.com
DOMAIN-SUFFIX,ui.ill.in.ua DOMAIN-SUFFIX,ui.ill.in.ua
DOMAIN-SUFFIX,ukr.net DOMAIN-SUFFIX,ukr.net
DOMAIN-SUFFIX,ukr.radio DOMAIN-SUFFIX,ukr.radio

View File

@@ -66,10 +66,12 @@ ipset=/baikal-journal.ru/vpn_domains
ipset=/bato.to/vpn_domains ipset=/bato.to/vpn_domains
ipset=/bbc.co.uk/vpn_domains ipset=/bbc.co.uk/vpn_domains
ipset=/bbc.com/vpn_domains ipset=/bbc.com/vpn_domains
ipset=/bbci.co.uk/vpn_domains
ipset=/bcbits.com/vpn_domains ipset=/bcbits.com/vpn_domains
ipset=/bell-sw.com/vpn_domains ipset=/bell-sw.com/vpn_domains
ipset=/bellingcat.com/vpn_domains ipset=/bellingcat.com/vpn_domains
ipset=/bestbuy.com/vpn_domains ipset=/bestbuy.com/vpn_domains
ipset=/bestchange.ru/vpn_domains
ipset=/bihus.info/vpn_domains ipset=/bihus.info/vpn_domains
ipset=/bitdefender.com/vpn_domains ipset=/bitdefender.com/vpn_domains
ipset=/blackseanews.net/vpn_domains ipset=/blackseanews.net/vpn_domains
@@ -700,6 +702,7 @@ ipset=/twtrdns.net/vpn_domains
ipset=/twttr.com/vpn_domains ipset=/twttr.com/vpn_domains
ipset=/twttr.net/vpn_domains ipset=/twttr.net/vpn_domains
ipset=/twvid.com/vpn_domains ipset=/twvid.com/vpn_domains
ipset=/typing.com/vpn_domains
ipset=/ui.ill.in.ua/vpn_domains ipset=/ui.ill.in.ua/vpn_domains
ipset=/ukr.net/vpn_domains ipset=/ukr.net/vpn_domains
ipset=/ukr.radio/vpn_domains ipset=/ukr.radio/vpn_domains

View File

@@ -66,10 +66,12 @@ nftset=/baikal-journal.ru/4#inet#fw4#vpn_domains
nftset=/bato.to/4#inet#fw4#vpn_domains nftset=/bato.to/4#inet#fw4#vpn_domains
nftset=/bbc.co.uk/4#inet#fw4#vpn_domains nftset=/bbc.co.uk/4#inet#fw4#vpn_domains
nftset=/bbc.com/4#inet#fw4#vpn_domains nftset=/bbc.com/4#inet#fw4#vpn_domains
nftset=/bbci.co.uk/4#inet#fw4#vpn_domains
nftset=/bcbits.com/4#inet#fw4#vpn_domains nftset=/bcbits.com/4#inet#fw4#vpn_domains
nftset=/bell-sw.com/4#inet#fw4#vpn_domains nftset=/bell-sw.com/4#inet#fw4#vpn_domains
nftset=/bellingcat.com/4#inet#fw4#vpn_domains nftset=/bellingcat.com/4#inet#fw4#vpn_domains
nftset=/bestbuy.com/4#inet#fw4#vpn_domains nftset=/bestbuy.com/4#inet#fw4#vpn_domains
nftset=/bestchange.ru/4#inet#fw4#vpn_domains
nftset=/bihus.info/4#inet#fw4#vpn_domains nftset=/bihus.info/4#inet#fw4#vpn_domains
nftset=/bitdefender.com/4#inet#fw4#vpn_domains nftset=/bitdefender.com/4#inet#fw4#vpn_domains
nftset=/blackseanews.net/4#inet#fw4#vpn_domains nftset=/blackseanews.net/4#inet#fw4#vpn_domains
@@ -700,6 +702,7 @@ nftset=/twtrdns.net/4#inet#fw4#vpn_domains
nftset=/twttr.com/4#inet#fw4#vpn_domains nftset=/twttr.com/4#inet#fw4#vpn_domains
nftset=/twttr.net/4#inet#fw4#vpn_domains nftset=/twttr.net/4#inet#fw4#vpn_domains
nftset=/twvid.com/4#inet#fw4#vpn_domains nftset=/twvid.com/4#inet#fw4#vpn_domains
nftset=/typing.com/4#inet#fw4#vpn_domains
nftset=/ui.ill.in.ua/4#inet#fw4#vpn_domains nftset=/ui.ill.in.ua/4#inet#fw4#vpn_domains
nftset=/ukr.net/4#inet#fw4#vpn_domains nftset=/ukr.net/4#inet#fw4#vpn_domains
nftset=/ukr.radio/4#inet#fw4#vpn_domains nftset=/ukr.radio/4#inet#fw4#vpn_domains

View File

@@ -65,10 +65,12 @@ baikal-journal.ru
bato.to bato.to
bbc.co.uk bbc.co.uk
bbc.com bbc.com
bbci.co.uk
bcbits.com bcbits.com
bell-sw.com bell-sw.com
bellingcat.com bellingcat.com
bestbuy.com bestbuy.com
bestchange.ru
bihus.info bihus.info
bitdefender.com bitdefender.com
blackseanews.net blackseanews.net
@@ -698,6 +700,7 @@ twtrdns.net
twttr.com twttr.com
twttr.net twttr.net
twvid.com twvid.com
typing.com
ui.ill.in.ua ui.ill.in.ua
ukr.net ukr.net
ukr.radio ukr.radio

View File

@@ -66,10 +66,12 @@
/ip dns static add name=bato.to type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost /ip dns static add name=bato.to type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
/ip dns static add name=bbc.co.uk type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost /ip dns static add name=bbc.co.uk type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
/ip dns static add name=bbc.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost /ip dns static add name=bbc.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
/ip dns static add name=bbci.co.uk type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
/ip dns static add name=bcbits.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost /ip dns static add name=bcbits.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
/ip dns static add name=bell-sw.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost /ip dns static add name=bell-sw.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
/ip dns static add name=bellingcat.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost /ip dns static add name=bellingcat.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
/ip dns static add name=bestbuy.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost /ip dns static add name=bestbuy.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
/ip dns static add name=bestchange.ru type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
/ip dns static add name=bihus.info type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost /ip dns static add name=bihus.info type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
/ip dns static add name=bitdefender.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost /ip dns static add name=bitdefender.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
/ip dns static add name=blackseanews.net type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost /ip dns static add name=blackseanews.net type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
@@ -700,6 +702,7 @@
/ip dns static add name=twttr.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost /ip dns static add name=twttr.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
/ip dns static add name=twttr.net type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost /ip dns static add name=twttr.net type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
/ip dns static add name=twvid.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost /ip dns static add name=twvid.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
/ip dns static add name=typing.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
/ip dns static add name=ui.ill.in.ua type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost /ip dns static add name=ui.ill.in.ua type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
/ip dns static add name=ukr.net type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost /ip dns static add name=ukr.net type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
/ip dns static add name=ukr.radio type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost /ip dns static add name=ukr.radio type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost

View File

@@ -66,10 +66,12 @@ baikal-journal.ru
bato.to bato.to
bbc.co.uk bbc.co.uk
bbc.com bbc.com
bbci.co.uk
bcbits.com bcbits.com
bell-sw.com bell-sw.com
bellingcat.com bellingcat.com
bestbuy.com bestbuy.com
bestchange.ru
bihus.info bihus.info
bitdefender.com bitdefender.com
blackseanews.net blackseanews.net
@@ -700,6 +702,7 @@ twtrdns.net
twttr.com twttr.com
twttr.net twttr.net
twvid.com twvid.com
typing.com
ui.ill.in.ua ui.ill.in.ua
ukr.net ukr.net
ukr.radio ukr.radio

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -190,7 +190,7 @@ def generate_srs_domains(domains, output_name):
os.makedirs(compiled_output_directory, exist_ok=True) os.makedirs(compiled_output_directory, exist_ok=True)
data = { data = {
"version": 2, "version": 3,
"rules": [ "rules": [
{"domain_suffix": domains} {"domain_suffix": domains}
] ]
@@ -234,7 +234,7 @@ def generate_srs_for_categories(directories, output_json_directory='JSON', compi
domains.append(domain) domains.append(domain)
data = { data = {
"version": 2, "version": 3,
"rules": [ "rules": [
{ {
"domain_suffix": domains "domain_suffix": domains
@@ -273,7 +273,7 @@ def generate_srs_subnets(input_file, output_json_directory='JSON', compiled_outp
if subnet: if subnet:
subnets.append(subnet) subnets.append(subnet)
data = { data = {
"version": 2, "version": 3,
"rules": [ "rules": [
{ {
"ip_cidr": subnets "ip_cidr": subnets
@@ -282,14 +282,14 @@ def generate_srs_subnets(input_file, output_json_directory='JSON', compiled_outp
} }
filename = os.path.splitext(os.path.basename(input_file))[0] filename = os.path.splitext(os.path.basename(input_file))[0]
output_file_path = os.path.join(output_json_directory, f"{filename}_subnets.json") output_file_path = os.path.join(output_json_directory, f"{filename}.json")
with open(output_file_path, 'w', encoding='utf-8') as output_file: with open(output_file_path, 'w', encoding='utf-8') as output_file:
json.dump(data, output_file, indent=4) json.dump(data, output_file, indent=4)
print(f"JSON file generated: {output_file_path}") print(f"JSON file generated: {output_file_path}")
srs_file_path = os.path.join(compiled_output_directory, f"{filename}_subnets.srs") srs_file_path = os.path.join(compiled_output_directory, f"{filename}.srs")
try: try:
subprocess.run( subprocess.run(
["sing-box", "rule-set", "compile", output_file_path, "-o", srs_file_path], check=True ["sing-box", "rule-set", "compile", output_file_path, "-o", srs_file_path], check=True
@@ -314,7 +314,7 @@ def generate_srs_combined(input_subnets_file, input_domains_file, output_json_di
if input_subnets_file == "Subnets/IPv4/discord.lst": if input_subnets_file == "Subnets/IPv4/discord.lst":
data = { data = {
"version": 2, "version": 3,
"rules": [ "rules": [
{ {
"domain_suffix": domains "domain_suffix": domains
@@ -328,7 +328,7 @@ def generate_srs_combined(input_subnets_file, input_domains_file, output_json_di
} }
else: else:
data = { data = {
"version": 2, "version": 3,
"rules": [ "rules": [
{ {
"domain_suffix": domains, "domain_suffix": domains,