From 92e4d9a24a2c621f61e20f8c9fc795f34f816c8d Mon Sep 17 00:00:00 2001 From: itdoginfo Date: Fri, 29 Aug 2025 10:45:16 +0300 Subject: [PATCH] Fix HODCA, DO, Cloudfront --- Categories/{HODCA.lst => hodca.lst} | 0 Services/cloudfront.lst | 1 + Services/digitalocean.lst | 1 + Subnets/IPv4/{do.lst => digitalocean.lst} | 0 Subnets/IPv4/ovh.lst | 5 +++++ Subnets/IPv6/{do.lst => digitalocean.lst} | 0 convert.py | 8 ++++++-- get-subnets.py | 10 +++++----- 8 files changed, 18 insertions(+), 7 deletions(-) rename Categories/{HODCA.lst => hodca.lst} (100%) create mode 100644 Services/cloudfront.lst create mode 100644 Services/digitalocean.lst rename Subnets/IPv4/{do.lst => digitalocean.lst} (100%) rename Subnets/IPv6/{do.lst => digitalocean.lst} (100%) diff --git a/Categories/HODCA.lst b/Categories/hodca.lst similarity index 100% rename from Categories/HODCA.lst rename to Categories/hodca.lst diff --git a/Services/cloudfront.lst b/Services/cloudfront.lst new file mode 100644 index 0000000..3f77792 --- /dev/null +++ b/Services/cloudfront.lst @@ -0,0 +1 @@ +cloudfront.net \ No newline at end of file diff --git a/Services/digitalocean.lst b/Services/digitalocean.lst new file mode 100644 index 0000000..e6196c5 --- /dev/null +++ b/Services/digitalocean.lst @@ -0,0 +1 @@ +digitalocean.com \ No newline at end of file diff --git a/Subnets/IPv4/do.lst b/Subnets/IPv4/digitalocean.lst similarity index 100% rename from Subnets/IPv4/do.lst rename to Subnets/IPv4/digitalocean.lst diff --git a/Subnets/IPv4/ovh.lst b/Subnets/IPv4/ovh.lst index 852aba1..3a6feb8 100644 --- a/Subnets/IPv4/ovh.lst +++ b/Subnets/IPv4/ovh.lst @@ -31,6 +31,8 @@ 31.56.52.0/22 31.56.77.0/24 31.56.190.0/24 +31.56.193.0/24 +31.56.195.0/24 31.57.161.0/24 31.57.199.0/24 31.59.68.0/24 @@ -42,6 +44,7 @@ 37.202.202.0/24 37.230.48.0/24 37.230.54.0/24 +37.230.63.0/24 40.160.0.0/17 40.160.224.0/22 40.160.228.0/24 @@ -196,6 +199,7 @@ 93.174.111.0/24 94.23.0.0/16 95.81.72.0/22 +95.135.60.0/24 95.169.162.0/24 95.214.177.0/24 96.62.105.0/24 @@ -209,6 +213,7 @@ 104.225.253.0/24 104.234.50.0/24 104.234.168.0/24 +104.243.245.0/24 104.254.209.0/24 107.189.64.0/18 108.165.220.0/24 diff --git a/Subnets/IPv6/do.lst b/Subnets/IPv6/digitalocean.lst similarity index 100% rename from Subnets/IPv6/do.lst rename to Subnets/IPv6/digitalocean.lst diff --git a/convert.py b/convert.py index fe71a9b..1b3cf10 100755 --- a/convert.py +++ b/convert.py @@ -23,7 +23,9 @@ TelegramSubnets = 'Subnets/IPv4/telegram.lst' CloudflareSubnets = 'Subnets/IPv4/cloudflare.lst' HetznerSubnets = 'Subnets/IPv4/hetzner.lst' OVHSubnets = 'Subnets/IPv4/ovh.lst' -ExcludeServices = {"telegram.lst", "cloudflare.lst", "google_ai.lst", "google_play.lst", 'hetzner.lst', 'ovh.lst'} +DigitalOceanSubnets = 'Subnets/IPv4/digitalocean.lst' +CloudfrontSubnets = 'Subnets/IPv4/cloudfront.lst' +ExcludeServices = {"telegram.lst", "cloudflare.lst", "google_ai.lst", "google_play.lst", 'hetzner.lst', 'ovh.lst', 'digitalocean.lst', 'cloudfront.lst'} def raw(src, out): domains = set() @@ -224,7 +226,7 @@ def generate_srs_for_categories(directories, output_json_directory='JSON', compi os.makedirs(output_json_directory, exist_ok=True) os.makedirs(compiled_output_directory, exist_ok=True) - exclude = {"meta", "twitter", "discord", "telegram", "hetzner", "ovh"} + exclude = {"meta", "twitter", "discord", "telegram", "hetzner", "ovh", "digitalocean", "cloudfront"} for directory in directories: for filename in os.listdir(directory): @@ -487,6 +489,8 @@ if __name__ == '__main__': generate_srs_combined(CloudflareSubnets, "Services/cloudflare.lst") generate_srs_combined(HetznerSubnets, "Services/hetzner.lst") generate_srs_combined(OVHSubnets, "Services/ovh.lst") + generate_srs_combined(DigitalOceanSubnets, "Services/digitalocean.lst") + generate_srs_combined(CloudfrontSubnets, "Services/cloudfront.lst") # Xray domains prepare_dat_domains(russia_inside, 'russia-inside', directories) diff --git a/get-subnets.py b/get-subnets.py index b86e75a..016658e 100755 --- a/get-subnets.py +++ b/get-subnets.py @@ -16,7 +16,7 @@ AS_META = '32934' AS_TWITTER = '13414' AS_HETZNER = '24940' AS_OVH = '16276' -AS_DO = '14061' +AS_DIGITALOCEAN = '14061' META = 'meta.lst' TWITTER = 'twitter.lst' @@ -24,7 +24,7 @@ TELEGRAM = 'telegram.lst' CLOUDFLARE = 'cloudflare.lst' HETZNER = 'hetzner.lst' OVH = 'ovh.lst' -DO = 'do.lst' +DIGITALOCEAN = 'digitalocean.lst' CLOUDFRONT = 'cloudfront.lst' # From https://iplist.opencck.org/ @@ -167,9 +167,9 @@ if __name__ == '__main__': write_subnets_to_file(ipv6_merged_ovh, f'{IPv6_DIR}/{OVH}') # Digital Ocean - ipv4_merged_do, ipv6_merged_do = process_subnets(subnet_list, AS_DO) - write_subnets_to_file(ipv4_merged_do, f'{IPv4_DIR}/{DO}') - write_subnets_to_file(ipv6_merged_do, f'{IPv6_DIR}/{DO}') + ipv4_merged_digitalocean, ipv6_merged_digitalocean = process_subnets(subnet_list, AS_DIGITALOCEAN) + write_subnets_to_file(ipv4_merged_digitalocean, f'{IPv4_DIR}/{DIGITALOCEAN}') + write_subnets_to_file(ipv6_merged_digitalocean, f'{IPv6_DIR}/{DIGITALOCEAN}') # Discord voice ipv4_discord, ipv6_discord = download_ready_subnets(DISCORD_VOICE_V4, DISCORD_VOICE_V6)