diff options
| author | mohammadmovaghari <52345697+mohammadmovaghari@users.noreply.github.com> | 2023-04-04 16:44:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-04 16:44:40 +0300 |
| commit | 9f18d60b9ce16d89af97ae993a3224bb6c8cd288 (patch) | |
| tree | 978b3178c6dd5bb616d46a442d8c50b19856bb70 /media | |
| parent | c0580bccb5b574f4a8e4a7f2789d5cdf6049e7fc (diff) | |
| parent | 0e5de1aec8f3b090fce14638d7e0030ff7b7f40f (diff) | |
Merge branch 'MHSanaei:main' into api-fix
Diffstat (limited to 'media')
| -rw-r--r-- | media/enable-traffic+block-IR-IP.txt | 18 | ||||
| -rw-r--r-- | media/enable-traffic+block-IR-domain.txt | 11 | ||||
| -rw-r--r-- | media/enable-traffic.txt | 5 |
3 files changed, 22 insertions, 12 deletions
diff --git a/media/enable-traffic+block-IR-IP.txt b/media/enable-traffic+block-IR-IP.txt index b1a1178f..919bef03 100644 --- a/media/enable-traffic+block-IR-IP.txt +++ b/media/enable-traffic+block-IR-IP.txt @@ -1,6 +1,6 @@ { "log": { - "loglevel": "warning", + "loglevel": "warning", "access": "./access.log" }, "api": { @@ -56,17 +56,23 @@ "type": "field" }, { - "ip": [ - "geoip:private", - "geoip:ir" + "outboundTag": "blocked", + "protocol": [ + "bittorrent" ], + "type": "field" + }, + { "outboundTag": "blocked", + "ip": [ + "geoip:private" + ], "type": "field" }, { "outboundTag": "blocked", - "protocol": [ - "bittorrent" + "ip": [ + "geoip:ir" ], "type": "field" } diff --git a/media/enable-traffic+block-IR-domain.txt b/media/enable-traffic+block-IR-domain.txt index efd548c0..4fcf3ee7 100644 --- a/media/enable-traffic+block-IR-domain.txt +++ b/media/enable-traffic+block-IR-domain.txt @@ -46,6 +46,7 @@ } }, "routing": { + "domainStrategy": "IPIfNonMatch", "rules": [ { "inboundTag": [ @@ -55,8 +56,8 @@ "type": "field" }, { - "domain": [ - "regexp:.+.ir$" + "ip": [ + "geoip:private" ], "outboundTag": "blocked", "type": "field" @@ -70,8 +71,10 @@ }, { "outboundTag": "blocked", - "ip": [ - "geoip:private" + "domain": [ + "regexp:.+.ir$", + "ext:iran.dat:ir", + "ext:iran.dat:other" ], "type": "field" } diff --git a/media/enable-traffic.txt b/media/enable-traffic.txt index 0acbd3aa..34e2038f 100644 --- a/media/enable-traffic.txt +++ b/media/enable-traffic.txt @@ -1,6 +1,6 @@ { "log": { - "loglevel": "warning", + "loglevel": "warning", "access": "./access.log" }, "api": { @@ -46,6 +46,7 @@ } }, "routing": { + "domainStrategy": "IPIfNonMatch", "rules": [ { "inboundTag": [ @@ -55,10 +56,10 @@ "type": "field" }, { + "outboundTag": "blocked", "ip": [ "geoip:private" ], - "outboundTag": "blocked", "type": "field" }, { |