From 9b75dbf6090550286c162ed3fe7c9b1cad74a233 Mon Sep 17 00:00:00 2001
From: Lord Alfred <2259979+lord-alfred@users.noreply.github.com>
Date: Mon, 22 Nov 2021 21:53:21 +0300
Subject: [PATCH] Add All-In-One IP ranges

---
 .github/workflows/update.yml | 7 +++++++
 README.md                    | 9 +++++++++
 all/ipv4.txt                 | 0
 all/ipv4_merged.txt          | 0
 all/ipv6.txt                 | 0
 all/ipv6_merged.txt          | 0
 6 files changed, 16 insertions(+)
 create mode 100644 all/ipv4.txt
 create mode 100644 all/ipv4_merged.txt
 create mode 100644 all/ipv6.txt
 create mode 100644 all/ipv6_merged.txt

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 3c72ffd5..0c8dcf83 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -18,6 +18,11 @@ jobs:
           bash oracle/downloader.sh
           bash digitalocean/downloader.sh
           bash bing/downloader.sh
+          
+      - name: Create All-In-One ranges
+        run: |
+          cat google/ipv4.txt amazon/ipv4.txt microsoft/ipv4.txt oracle/ipv4.txt digitalocean/ipv4.txt bing/ipv4.txt | sort -h > all/ipv4.txt
+          cat google/ipv6.txt amazon/ipv6.txt microsoft/ipv6.txt digitalocean/ipv6.txt | sort -h > all/ipv6.txt
 
       - name: Set up Python 3.7
         uses: actions/setup-python@v2
@@ -47,6 +52,7 @@ jobs:
           python utils/merge.py --source=oracle/ipv4.txt | sort -h > oracle/ipv4_merged.txt
           python utils/merge.py --source=digitalocean/ipv4.txt | sort -h > digitalocean/ipv4_merged.txt
           python utils/merge.py --source=bing/ipv4.txt | sort -h > bing/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
           python utils/merge.py --source=amazon/ipv6.txt | sort -h > amazon/ipv6_merged.txt
@@ -54,6 +60,7 @@ jobs:
           # oracle not provide ipv6
           python utils/merge.py --source=digitalocean/ipv6.txt | sort -h > digitalocean/ipv6_merged.txt
           # bing not provide ipv6
+          python utils/merge.py --source=all/ipv6.txt | sort -h > all/ipv6_merged.txt
 
       - name: Commit files
         env:
diff --git a/README.md b/README.md
index 1f3681f1..f95d9713 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,15 @@ All addresses are stored in `.txt` files with CIDRs, where each range is on a ne
 - IPv6: https://raw.githubusercontent.com/lord-alfred/ipranges/main/digitalocean/ipv6.txt
 - IPv6 (merged): https://raw.githubusercontent.com/lord-alfred/ipranges/main/digitalocean/ipv6_merged.txt
 
+## All-In-One IPs
+
+A list of IP addresses from all sources combined into one file.
+
+- IPv4: https://raw.githubusercontent.com/lord-alfred/ipranges/main/all/ipv4.txt
+- IPv4 (merged): https://raw.githubusercontent.com/lord-alfred/ipranges/main/all/ipv4_merged.txt
+- IPv6: https://raw.githubusercontent.com/lord-alfred/ipranges/main/all/ipv6.txt
+- IPv6 (merged): https://raw.githubusercontent.com/lord-alfred/ipranges/main/all/ipv6_merged.txt
+
 ## Friendly Repos
 
 - Akamai: https://github.com/SecOps-Institute/Akamai-ASN-and-IPs-List
diff --git a/all/ipv4.txt b/all/ipv4.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/all/ipv4_merged.txt b/all/ipv4_merged.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/all/ipv6.txt b/all/ipv6.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/all/ipv6_merged.txt b/all/ipv6_merged.txt
new file mode 100644
index 00000000..e69de29b