# Conflicts:
#	install.sh
pull/73/head
jamesmarc2016 7 years ago
commit be26b620bb
  1. 10
      config/backup.txt
  2. 4
      config/blocked_hosts/server/http.json
  3. 4
      config/blocked_hosts/server/http_dynamic.json
  4. 4
      config/blocked_hosts/server/http_ss.json
  5. 4
      config/blocked_hosts/server/http_ss_dynamic.json
  6. 4
      config/blocked_hosts/server/kcp.json
  7. 4
      config/blocked_hosts/server/kcp_dynamic.json
  8. 4
      config/blocked_hosts/server/kcp_ss.json
  9. 4
      config/blocked_hosts/server/kcp_ss_dynamic.json
  10. 4
      config/blocked_hosts/server/tcp.json
  11. 4
      config/blocked_hosts/server/tcp_dynamic.json
  12. 4
      config/blocked_hosts/server/tcp_ss.json
  13. 4
      config/blocked_hosts/server/tcp_ss_dynamic.json
  14. 4
      config/blocked_hosts/server/ws.json
  15. 4
      config/blocked_hosts/server/ws_dynamic.json
  16. 4
      config/blocked_hosts/server/ws_ss.json
  17. 4
      config/blocked_hosts/server/ws_ss_dynamic.json
  18. 4
      config/client/http.json
  19. 4
      config/client/kcp.json
  20. 4
      config/client/tcp.json
  21. 4
      config/client/ws.json
  22. 4
      config/client/ws_tls.json
  23. 4
      config/server/http.json
  24. 4
      config/server/http_dynamic.json
  25. 4
      config/server/http_ss.json
  26. 4
      config/server/http_ss_dynamic.json
  27. 4
      config/server/kcp.json
  28. 4
      config/server/kcp_dynamic.json
  29. 4
      config/server/kcp_ss.json
  30. 4
      config/server/kcp_ss_dynamic.json
  31. 4
      config/server/tcp.json
  32. 4
      config/server/tcp_dynamic.json
  33. 4
      config/server/tcp_ss.json
  34. 4
      config/server/tcp_ss_dynamic.json
  35. 4
      config/server/ws.json
  36. 4
      config/server/ws_dynamic.json
  37. 4
      config/server/ws_ss.json
  38. 4
      config/server/ws_ss_dynamic.json

@ -16,15 +16,15 @@
---- V2Ray 传输协议 -----
1
---- V2Ray 端口 -----
2333
80
---- UUID -----
23332333-2333-2333-2333-233boy233boy
fea41d6f-9764-4822-9289-f007409ff55b
---- V2Ray 动态端口开始 -----
10000
---- V2Ray 动态端口结束 -----
20000
---- 域名 -----
233blog.com
jamesmarc.com
---- caddy -----
false
---- Shadowsocks -----
@ -32,11 +32,11 @@ false
---- Shadowsocks 端口 -----
6666
---- Shadowsocks 密码 -----
233blog.com
jamesmarc2016
---- Shadowsocks 加密协议 -----
chacha20-ietf
---- 屏蔽广告 -----
false
true
---- 网站伪装 -----
false
---- 伪装的路径 -----

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
]
},

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
],
"detour": {

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
]
},

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
],
"detour": {

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
]
},

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
],
"detour": {

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
]
},

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
],
"detour": {

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
]
}

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
],
"detour": {

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
]
}

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
],
"detour": {

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
]
},

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
],
"detour": {

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
]
},

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
],
"detour": {

@ -22,8 +22,8 @@
"port": 2333,
"users": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"alterId": 233,
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"alterId": 255,
"security": "auto"
}
]

@ -22,8 +22,8 @@
"port": 2333,
"users": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"alterId": 233,
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"alterId": 255,
"security": "auto"
}
]

@ -22,8 +22,8 @@
"port": 2333,
"users": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"alterId": 233,
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"alterId": 255,
"security": "auto"
}
]

@ -22,8 +22,8 @@
"port": 2333,
"users": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"alterId": 233,
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"alterId": 255,
"security": "auto"
}
]

@ -22,8 +22,8 @@
"port": 2333,
"users": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"alterId": 233,
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"alterId": 255,
"security": "auto"
}
]

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
]
},

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
],
"detour": {

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
]
},

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
],
"detour": {

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
]
},

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
],
"detour": {

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
]
},

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
],
"detour": {

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
]
}

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
],
"detour": {

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
]
}

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
],
"detour": {

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
]
},

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
],
"detour": {

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
]
},

@ -11,9 +11,9 @@
"udp": true,
"clients": [
{
"id": "23332333-2333-2333-2333-233boy233boy",
"id": "fea41d6f-9764-4822-9289-f007409ff55b",
"level": 1,
"alterId": 233
"alterId": 255
}
],
"detour": {

Loading…
Cancel
Save