diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 0544d25f..6e126236 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -32,11 +32,12 @@ jobs: bash telegram/downloader.sh bash openai/downloader.sh || echo 'GPTBot download failed' # TODO: fixme bash cloudflare/downloader.sh + bash vultr/downloader.sh - name: Create All-In-One ranges run: | - cat google/ipv4.txt googlebot/ipv4.txt amazon/ipv4.txt microsoft/ipv4.txt oracle/ipv4.txt digitalocean/ipv4.txt bing/ipv4.txt github/ipv4.txt facebook/ipv4.txt twitter/ipv4.txt linode/ipv4.txt telegram/ipv4.txt openai/ipv4.txt cloudflare/ipv4.txt | sort -V | uniq > all/ipv4.txt - cat google/ipv6.txt googlebot/ipv6.txt amazon/ipv6.txt microsoft/ipv6.txt digitalocean/ipv6.txt github/ipv6.txt facebook/ipv6.txt twitter/ipv6.txt linode/ipv6.txt telegram/ipv6.txt cloudflare/ipv6.txt | sort -V | uniq > all/ipv6.txt + cat google/ipv4.txt googlebot/ipv4.txt amazon/ipv4.txt microsoft/ipv4.txt oracle/ipv4.txt digitalocean/ipv4.txt bing/ipv4.txt github/ipv4.txt facebook/ipv4.txt twitter/ipv4.txt linode/ipv4.txt telegram/ipv4.txt openai/ipv4.txt cloudflare/ipv4.txt vultr/ipv4.txt | sort -V | uniq > all/ipv4.txt + cat google/ipv6.txt googlebot/ipv6.txt amazon/ipv6.txt microsoft/ipv6.txt digitalocean/ipv6.txt github/ipv6.txt facebook/ipv6.txt twitter/ipv6.txt linode/ipv6.txt telegram/ipv6.txt cloudflare/ipv6.txt vultr/ipv6.txt | sort -V | uniq > all/ipv6.txt - name: Set up Python 3.7 uses: actions/setup-python@v2 @@ -75,6 +76,7 @@ jobs: python utils/merge.py --source=telegram/ipv4.txt | sort -V > telegram/ipv4_merged.txt python utils/merge.py --source=openai/ipv4.txt | sort -V > openai/ipv4_merged.txt python utils/merge.py --source=cloudflare/ipv4.txt | sort -V > cloudflare/ipv4_merged.txt + python utils/merge.py --source=vultr/ipv4.txt | sort -V > vultr/ipv4_merged.txt python utils/merge.py --source=all/ipv4.txt | sort -V > all/ipv4_merged.txt # ipv6 python utils/merge.py --source=google/ipv6.txt | sort -V > google/ipv6_merged.txt @@ -91,6 +93,7 @@ jobs: python utils/merge.py --source=telegram/ipv6.txt | sort -V > telegram/ipv6_merged.txt # openai not provide ipv6 python utils/merge.py --source=cloudflare/ipv6.txt | sort -V > cloudflare/ipv6_merged.txt + python utils/merge.py --source=vultr/ipv6.txt | sort -V > vultr/ipv6_merged.txt python utils/merge.py --source=all/ipv6.txt | sort -V > all/ipv6_merged.txt - name: Commit files diff --git a/README.md b/README.md index 4b046c27..10f667ce 100644 --- a/README.md +++ b/README.md @@ -110,6 +110,13 @@ To allow GoogleBot, block all Google IP addresses and then allow the GoogleBot a - IPv6: https://raw.githubusercontent.com/lord-alfred/ipranges/main/cloudflare/ipv6.txt - IPv6 (merged): https://raw.githubusercontent.com/lord-alfred/ipranges/main/cloudflare/ipv6_merged.txt +### Vultr + +- IPv4: https://raw.githubusercontent.com/lord-alfred/ipranges/main/vultr/ipv4.txt +- IPv4 (merged): https://raw.githubusercontent.com/lord-alfred/ipranges/main/vultr/ipv4_merged.txt +- IPv6: https://raw.githubusercontent.com/lord-alfred/ipranges/main/vultr/ipv6.txt +- IPv6 (merged): https://raw.githubusercontent.com/lord-alfred/ipranges/main/vultr/ipv6_merged.txt + ## All-In-One IPs A list of IP addresses from all sources combined into one file. diff --git a/vultr/downloader.sh b/vultr/downloader.sh new file mode 100644 index 00000000..bac51ff5 --- /dev/null +++ b/vultr/downloader.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +# https://docs.vultr.com/vultr-ip-space +# https://geofeed.constant.com/?json + +set -euo pipefail +set -x + + +# get from public ranges +curl -s https://geofeed.constant.com/?text > /tmp/vultr.txt + +#save ipv4 +grep -v ':' /tmp/vultr.txt > /tmp/vultr-ipv4.txt + +#save ipv6 +grep ':' /tmp/vultr.txt > /tmp/vultr-ipv6.txt + +# sort & uniq +sort -V /tmp/vultr-ipv4.txt | uniq > vultr/ipv4.txt +sort -V /tmp/vultr-ipv6.txt | uniq > vultr/ipv6.txt