Merge pull request #1 from KiriKira/master

back

websocket+TLS/config_client.json

@@ -16,27 +16,31 @@
   "tag": "agentout", 
   "protocol": "vmess", 
   "mux": {
-      "enabled": true,
+   "enabled": true
-      "concurrency": 8
   }, 
   "settings": {
-      "vnext": [{
+   "vnext": [
-        "users": [{
+    {
+     "users": [
+      {
        "alterId": 100, 
        "security": "aes-128-gcm", 
-          "id": "e2b39869-7e9e-411b-a561-00904419bed9"
+       "id": "0cdf8a45-303d-4fed-9780-29aa7f54175e"
-        }],
+      }
+     ], 
      "port": 443, 
      "address": "example.domain"
-      }]
+    }
+   ]
   }
  }, 
  "log": {
   "access": "", 
-    "loglevel": "debug",
+  "loglevel": "info", 
   "error": ""
  }, 
-  "outboundDetour": [{
+ "outboundDetour": [
+  {
    "tag": "direct", 
    "protocol": "freedom", 
    "settings": {
@@ -62,13 +66,14 @@
    "auth": "noauth"
   }, 
   "protocol": "socks", 
-    "port": 10086,
+  "port": 1080, 
   "listen": "0.0.0.0"
  }, 
  "inboundDetour": null, 
  "routing": {
   "settings": {
-      "rules": [{
+   "rules": [
+    {
      "ip": [
       "0.0.0.0/8", 
       "10.0.0.0/8", 
@@ -90,7 +95,8 @@
      "type": "field", 
      "port": null, 
      "outboundTag": "direct"
-      }],
+    }
+   ], 
    "domainStrategy": "IPIfNonMatch"
   }, 
   "strategy": "rules"

websocket+TLS/config_server.json

@@ -8,59 +8,60 @@
  }, 
  "log": {
   "access": "/var/log/v2ray/access.log", 
-    "loglevel": "info",
+  "loglevel": "error", 
   "error": "/var/log/v2ray/error.log"
  }, 
-  "outboundDetour": [{
+ "inboundDetour": null, 
-    "tag": "blocked",
-    "protocol": "blackhole",
-    "settings": null
-  }],
  "inbound": {
   "streamSettings": {
-      "network": "kcp",
+   "network": "ws", 
-      "kcpSettings": {
+   "kcpSettings": null, 
-        "uplinkCapacity": 100,
+   "wsSettings": {
-        "downlinkCapacity": 100,
+    "headers": {
-        "readBufferSize": 2,
+     "host": "example.domain"
-        "mtu": 1350,
-        "header": {
-          "type": "srtp",
-          "request": null,
-          "response": null
     }, 
-        "tti": 50,
+    "path": "", 
-        "congestion": false,
+    "connectionReuse": true
-        "writeBufferSize": 2
    }, 
-      "wsSettings": null,
    "tcpSettings": null, 
    "tlsSettings": {
-        "certificates": [{
+    "certificates": [
+     {
       "keyFile": "/path/to/example.domain.key", 
       "certificateFile": "/path/to/example.domain/fullchain.cer"
-        }]
+     }
+    ]
    }, 
    "security": "tls"
   }, 
+  "listen": null, 
+  "protocol": "vmess", 
+  "port": 443, 
   "settings": {
    "ip": null, 
    "udp": true, 
-      "clients": [{
+   "clients": [
+    {
      "alterId": 100, 
      "security": "aes-128-gcm", 
-        "id": "e2b39869-7e9e-411b-a561-00904419bed9"
+     "id": "0cdf8a45-303d-4fed-9780-29aa7f54175e"
-      }],
+    }
+   ], 
    "auth": null
+  }
  }, 
-    "protocol": "vmess",
+ "outboundDetour": [
-    "port": 443,
+  {
-    "listen": null
+   "tag": "blocked", 
-  },
+   "protocol": "blackhole", 
-  "inboundDetour": null,
+   "settings": null
+  }
+ ], 
  "routing": {
+  "strategy": "rules", 
   "settings": {
-      "rules": [{
+   "rules": [
+    {
      "ip": [
       "0.0.0.0/8", 
       "10.0.0.0/8", 
@@ -82,10 +83,10 @@
      "type": "field", 
      "port": null, 
      "outboundTag": "blocked"
-      }],
+    }
+   ], 
    "domainStrategy": null
-    },
+  }
-    "strategy": "rules"
  }, 
  "dns": null
 }