update example files

3 files changed, 21 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..044fed87 100644
--- a/media/enable-traffic+block-IR-domain.txt
+++ b/media/enable-traffic+block-IR-domain.txt
@@ -55,8 +55,8 @@
         "type": "field"
       },
       {
-        "domain": [
-          "regexp:.+.ir$"
+        "ip": [
+          "geoip:private"
         ],
         "outboundTag": "blocked",
         "type": "field"
@@ -70,8 +70,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"
       },
       {