source: use combined cn geoip

Author: mochaaP

.github/workflows/build.yml

@@ -36,16 +36,9 @@ jobs:
       - name: Fetch external data
         run: ./external.sh
 
-      - name: Get GeoLite2
-        run: |
-          curl -L "https://github.com/Loyalsoldier/geoip/raw/release/GeoLite2-Country-CSV.zip" -o GeoLite2-Country-CSV.zip
-          unzip GeoLite2-Country-CSV.zip
-          rm -f GeoLite2-Country-CSV.zip
-          mv GeoLite2* geolite2
-
       - name: Build Country.mmdb file
         run: |
-          go run ./
+          go run .
 
       - name: Generate sha256 checksum for mmdb files
         run: |

config.json

@@ -1,28 +1,11 @@
 {
   "input": [
-    {
-      "type": "maxmindGeoLite2CountryCSV",
-      "action": "add",
-      "args": {
-        "country": "./geolite2/GeoLite2-Country-Locations-en.csv",
-        "ipv4": "./geolite2/GeoLite2-Country-Blocks-IPv4.csv",
-        "ipv6": "./geolite2/GeoLite2-Country-Blocks-IPv6.csv"
-      }
-    },
-    {
-      "type": "cutter",
-      "action": "remove",
-      "args": {
-        "wantedList": ["cn"],
-        "onlyIPType": "ipv4"
-      }
-    },
     {
       "type": "text",
       "action": "add",
       "args": {
         "name": "cn",
-        "uri": "https://raw.githubusercontent.com/17mon/china_ip_list/master/china_ip_list.txt",
+        "uri": "https://raw.githubusercontent.com/Hackl0us/GeoIP2-CN/release/CN-ip-cidr.txt",
         "onlyIPType": "ipv4"
       }
     },