From 04ef1493152e7abf477b8fc2a00a785890d024ae Mon Sep 17 00:00:00 2001 From: Anton Volnuhin Date: Thu, 23 Mar 2023 20:17:00 +0000 Subject: [PATCH] add corbina, expanad mts, less updates per day --- .github/workflows/update.yml | 4 +++- corbina/downloader.sh | 27 +++++++++++++++++++++++++++ mts/downloader.sh | 2 ++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100755 corbina/downloader.sh diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index a6f4c6bb..409b2f7a 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -3,7 +3,7 @@ name: "Update" on: workflow_dispatch: schedule: - - cron: '8 */4 * * *' # At minute 8 past every 4th hour + - cron: '8 */8 * * *' # At minute 8 past every 8th hour jobs: updater: @@ -70,6 +70,7 @@ jobs: bash yandexcloud/downloader.sh bash mtscloud/downloader.sh bash mts/downloader.sh + bash corbina/downloader.sh - name: Create All-In-One ranges run: | @@ -108,6 +109,7 @@ jobs: python utils/merge.py --source=yandexcloud/ipv4.txt | sort -h > yandexcloud/ipv4_merged.txt python utils/merge.py --source=mtscloud/ipv4.txt | sort -h > mtscloud/ipv4_merged.txt python utils/merge.py --source=mts/ipv4.txt | sort -h > mts/ipv4_merged.txt + python utils/merge.py --source=corbina/ipv4.txt | sort -h > corbina/ipv4_merged.txt python utils/merge.py --source=all/ipv4.txt | sort -h > all/ipv4_merged.txt # ipv6 python utils/merge.py --source=google/ipv6.txt | sort -h > google/ipv6_merged.txt diff --git a/corbina/downloader.sh b/corbina/downloader.sh new file mode 100755 index 00000000..10eb529d --- /dev/null +++ b/corbina/downloader.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +set -euo pipefail +set -x + + +# get from Autonomous System +get_maintained() { + whois -h whois.ripe.net -- "-i mnt-by $1" | grep '^route' | awk '{ print $2; }' + whois -h whois.radb.net -- "-i mnt-by $1" | grep '^route' | awk '{ print $2; }' + whois -h rr.ntt.net -- "-i mnt-by $1" | grep '^route' | awk '{ print $2; }' + whois -h whois.ripe.net -- "-i mnt-by $1" | grep inetnum|awk '{$1=""; system("ipcalc -b -r "$2" "$4"| tail +2");}' +} + + + + +#get_maintained 'MNT-CLOUDMTS' > /tmp/corbina.txt || echo 'failed' +get_maintained 'RU-CORBINA-MNT' > /tmp/corbina.txt || echo 'failed' + + +# save ipv4 +grep -v ':' /tmp/corbina.txt > /tmp/corbina-ipv4.txt + + +# sort & uniq +sort -h /tmp/corbina-ipv4.txt | uniq > corbina/ipv4.txt diff --git a/mts/downloader.sh b/mts/downloader.sh index 5217807c..35fce269 100755 --- a/mts/downloader.sh +++ b/mts/downloader.sh @@ -17,6 +17,8 @@ get_maintained() { #get_maintained 'MNT-CLOUDMTS' > /tmp/mts.txt || echo 'failed' get_maintained 'MTU-NOC' > /tmp/mts.txt || echo 'failed' +get_maintained 'MGTS-MNT' > /tmp/mts.txt || echo 'failed' +get_maintained 'MGTS-USPD-MNT' > /tmp/mts.txt || echo 'failed' # save ipv4