diff --git a/.github/workflows/create-lists.yml b/.github/workflows/create-lists.yml index 09a4fea..f90f739 100644 --- a/.github/workflows/create-lists.yml +++ b/.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.15 + itdoginfo/compilesrs:0.1.16 - name: Check Russia/inside-dnsmasq-ipset uses: itdoginfo/dnsmasq-action@0.1 diff --git a/Services/googleai.lst b/Services/googleai.lst new file mode 100644 index 0000000..d0991a7 --- /dev/null +++ b/Services/googleai.lst @@ -0,0 +1,14 @@ +deepmind.com +deepmind.google +geller-pa.googleapis.com +generativelanguage.googleapis.com +proactivebackend-pa.googleapis.com +ai.google.dev +alkalicore-pa.clients6.google.com +alkalimakersuite-pa.clients6.google.com +generativeai.google +makersuite.google.com +aistudio.google.com +bard.google.com +gemini.google +gemini.google.com \ No newline at end of file diff --git a/Services/googleplay.lst b/Services/googleplay.lst new file mode 100644 index 0000000..53a1a88 --- /dev/null +++ b/Services/googleplay.lst @@ -0,0 +1,12 @@ +googleplay.com +play-fe.googleapis.com +play-games.googleusercontent.com +play-lh.googleusercontent.com +play.google.com +play.googleapis.com +lh3.googleusercontent.com +connectivitycheck.gstatic.com +android.clients.google.com +prod-lt-playstoregatewayadapter-pa.googleapis.com +beacons.gvt2.com +gvt1.com \ No newline at end of file diff --git a/Services/hetzner.lst b/Services/hetzner.lst new file mode 100644 index 0000000..23be7fe --- /dev/null +++ b/Services/hetzner.lst @@ -0,0 +1 @@ +hetzner.com \ No newline at end of file diff --git a/Services/ovh.lst b/Services/ovh.lst new file mode 100644 index 0000000..5a314cc --- /dev/null +++ b/Services/ovh.lst @@ -0,0 +1 @@ +ovhcloud.com \ No newline at end of file diff --git a/convert.py b/convert.py index 62ddd00..46b0a1a 100755 --- a/convert.py +++ b/convert.py @@ -21,7 +21,9 @@ MetaSubnets = 'Subnets/IPv4/meta.lst' TwitterSubnets = 'Subnets/IPv4/twitter.lst' TelegramSubnets = 'Subnets/IPv4/telegram.lst' CloudflareSubnets = 'Subnets/IPv4/cloudflare.lst' -ExcludeServices = {"telegram.lst", "cloudflare.lst"} +HetznerSubnets = 'Subnets/IPv4/hetzner.lst' +OVHSubnets = 'Subnets/IPv4/ovh.lst' +ExcludeServices = {"telegram.lst", "cloudflare.lst", "googleai.lst", "googleplay.lst", 'hetzner.lst', 'ovh.lst'} def raw(src, out): domains = set() @@ -222,7 +224,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"} + exclude = {"meta", "twitter", "discord", "telegram", "hetzner", "ovh"} for directory in directories: for filename in os.listdir(directory): @@ -456,6 +458,8 @@ if __name__ == '__main__': generate_srs_combined(MetaSubnets, "Services/meta.lst") generate_srs_combined(TelegramSubnets, "Services/telegram.lst") generate_srs_combined(CloudflareSubnets, "Services/cloudflare.lst") + generate_srs_combined(HetznerSubnets, "Services/hetzner.lst") + generate_srs_combined(OVHSubnets, "Services/ovh.lst") # Xray domains prepare_dat_domains(directories, 'russia-inside') diff --git a/get-subnets.py b/get-subnets.py index 2a76baf..3280584 100755 --- a/get-subnets.py +++ b/get-subnets.py @@ -13,10 +13,15 @@ IPv6_DIR = 'Subnets/IPv6' AS_META = '32934' AS_TWITTER = '13414' +AS_HETZNER = '24940' +AS_OVH = '16276' + META = 'meta.lst' TWITTER = 'twitter.lst' TELEGRAM = 'telegram.lst' CLOUDFLARE = 'cloudflare.lst' +HETZNER = 'hetzner.lst' +OVH = 'ovh.lst' # From https://iplist.opencck.org/ DISCORD_VOICE_V4='https://iplist.opencck.org/?format=text&data=cidr4&site=discord.gg&site=discord.media' @@ -122,6 +127,16 @@ if __name__ == '__main__': write_subnets_to_file(ipv4_merged_twitter, f'{IPv4_DIR}/{TWITTER}') write_subnets_to_file(ipv6_merged_twitter, f'{IPv6_DIR}/{TWITTER}') + # Hetzner + ipv4_merged_hetzner, ipv6_merged_hetzner = process_subnets(subnet_list, AS_HETZNER) + write_subnets_to_file(ipv4_merged_hetzner, f'{IPv4_DIR}/{HETZNER}') + write_subnets_to_file(ipv6_merged_hetzner, f'{IPv6_DIR}/{HETZNER}') + + # OVH + ipv4_merged_ovh, ipv6_merged_ovh = process_subnets(subnet_list, AS_OVH) + write_subnets_to_file(ipv4_merged_ovh, f'{IPv4_DIR}/{OVH}') + write_subnets_to_file(ipv6_merged_ovh, f'{IPv6_DIR}/{OVH}') + # Discord voice ipv4_discord, ipv6_discord = download_ready_subnets(DISCORD_VOICE_V4, DISCORD_VOICE_V6) write_subnets_to_file(ipv4_discord, f'{IPv4_DIR}/{DISCORD}')