Refine blacklist mode

Specify domain and sub-domain
Keep up with upstream behavior 18f0a8301a
2021-01-28 09:17:25 +08:00 · 2021-01-21 17:57:04 +08:00
2 changed files with 4 additions and 36 deletions
--- a/.github/workflows/run.yml
+++ b/.github/workflows/run.yml
@ -59,12 +59,14 @@ jobs:
      - name: Generate direct.txt file
        run: |
          echo "payload:" > direct.txt
-          curl -sSL ${Loyalsoldier_direct} | grep -Ev "^(regexp|keyword):" | perl -ne '/^(domain:|full:)?([-_a-zA-Z0-9]+(\.[-_a-zA-Z0-9]+)*)/ && print "  - |+.$2|\n"' | sed "s/|/'/g" >> direct.txt
+          curl -sSL ${Loyalsoldier_direct} | grep -Ev "^(regexp|keyword):" | perl -ne '/^(full:)([-_a-zA-Z0-9]+(\.[-_a-zA-Z0-9]+)*)/ && print "  - |$2|\n"' | sed "s/|/'/g" >> direct.txt
+          curl -sSL ${Loyalsoldier_direct} | grep -Ev "^(regexp|keyword):" | perl -ne '/^(domain:)?([-_a-zA-Z0-9]+(\.[-_a-zA-Z0-9]+)*)/ && print "  - |+.$2|\n"' | sed "s/|/'/g" >> direct.txt

      - name: Generate proxy.txt file
        run: |
          echo "payload:" > proxy.txt
-          curl -sSL ${Loyalsoldier_proxy} | grep -Ev "^(regexp|keyword):" | perl -ne '/^(domain:|full:)?([-_a-zA-Z0-9]+(\.[-_a-zA-Z0-9]+)*)/ && print "  - |+.$2|\n"' | sed "s/|/'/g" >> proxy.txt
+          curl -sSL ${Loyalsoldier_proxy} | grep -Ev "^(regexp|keyword):" | perl -ne '/^(full:)([-_a-zA-Z0-9]+(\.[-_a-zA-Z0-9]+)*)/ && print "  - |$2|\n"' | sed "s/|/'/g" >> proxy.txt
+          curl -sSL ${Loyalsoldier_proxy} | grep -Ev "^(regexp|keyword):" | perl -ne '/^(domain:)?([-_a-zA-Z0-9]+(\.[-_a-zA-Z0-9]+)*)/ && print "  - |+.$2|\n"' | sed "s/|/'/g" >> proxy.txt

      - name: Generate reject.txt file
        run: |
--- a/README.md
+++ b/README.md
@ -235,40 +235,6 @@ rules:
  - RULE-SET,gfw,PROXY
  - RULE-SET,greatfire,PROXY
  - RULE-SET,telegramcidr,PROXY
-  - GEOIP,AE,PROXY
-  - GEOIP,AU,PROXY
-  - GEOIP,BR,PROXY
-  - GEOIP,CA,PROXY
-  - GEOIP,DE,PROXY
-  - GEOIP,DK,PROXY
-  - GEOIP,ES,PROXY
-  - GEOIP,FI,PROXY
-  - GEOIP,FR,PROXY
-  - GEOIP,GB,PROXY
-  - GEOIP,GR,PROXY
-  - GEOIP,HK,PROXY
-  - GEOIP,ID,PROXY
-  - GEOIP,IL,PROXY
-  - GEOIP,IN,PROXY
-  - GEOIP,IQ,PROXY
-  - GEOIP,IR,PROXY
-  - GEOIP,IT,PROXY
-  - GEOIP,JP,PROXY
-  - GEOIP,KR,PROXY
-  - GEOIP,MO,PROXY
-  - GEOIP,MY,PROXY
-  - GEOIP,NL,PROXY
-  - GEOIP,NO,PROXY
-  - GEOIP,NZ,PROXY
-  - GEOIP,PH,PROXY
-  - GEOIP,RU,PROXY
-  - GEOIP,SA,PROXY
-  - GEOIP,SG,PROXY
-  - GEOIP,TH,PROXY
-  - GEOIP,TR,PROXY
-  - GEOIP,TW,PROXY
-  - GEOIP,US,PROXY
-  - GEOIP,VN,PROXY
  - MATCH,DIRECT
 ```
Author	SHA1	Message	Date
Loyalsoldier	5441d199cf	Refine blacklist mode	2021-01-28 09:17:25 +08:00
loyalsoldier	49f7eb8a57	Specify domain and sub-domain Keep up with upstream behavior `18f0a8301a`	2021-01-21 17:57:04 +08:00