k
/
v2ray
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix dynamicPort bugs

Browse Source
test
233boy 6 years ago
parent f9f1d7fd72
commit 502ced4359
15 changed files with 66 additions and 347 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 31
      config/server/dynamic/http.json
  2. 38
      config/server/dynamic/kcp.json
  3. 40
      config/server/dynamic/quic.json
  4. 31
      config/server/dynamic/tcp.json
  5. 31
      config/server/dynamic/ws.json
  6. 31
      config/server/h2.json
  7. 31
      config/server/http.json
  8. 30
      config/server/include/ban.json
  9. 31
      config/server/kcp.json
  10. 31
      config/server/quic.json
  11. 31
      config/server/tcp.json
  12. 31
      config/server/ws.json
  13. 4
      src/ban_xx.sh
  14. 3
      src/config.sh
  15. 15
      v2ray.sh

31
config/server/dynamic/http.json
Unescape View File

@ -148,41 +148,12 @@
], ],
"outboundTag": "blocked" "outboundTag": "blocked"
}, },
{
"type": "field",
"domain": [
"domain:epochtimes.com",
"domain:epochtimes.com.tw",
"domain:epochtimes.fr",
"domain:epochtimes.de",
"domain:epochtimes.jp",
"domain:epochtimes.ru",
"domain:epochtimes.co.il",
"domain:epochtimes.co.kr",
"domain:epochtimes-romania.com",
"domain:erabaru.net",
"domain:lagranepoca.com",
"domain:theepochtimes.com",
"domain:ntdtv.com",
"domain:ntd.tv",
"domain:ntdtv-dc.com",
"domain:ntdtv.com.tw",
"domain:minghui.org",
"domain:renminbao.com",
"domain:dafahao.com",
"domain:dongtaiwang.com",
"domain:falundafa.org",
"domain:wujieliulan.com",
"domain:ninecommentaries.com",
"domain:shenyun.com"
],
"outboundTag": "blocked"
},
{ {
"type": "field", "type": "field",
"inboundTag": ["tg-in"], "inboundTag": ["tg-in"],
"outboundTag": "tg-out" "outboundTag": "tg-out"
} }
//include_ban_xx
//include_ban_bt //include_ban_bt
//include_ban_ad //include_ban_ad
//include_rules //include_rules

38
config/server/dynamic/kcp.json
Unescape View File

@ -21,7 +21,12 @@
} }
}, },
"streamSettings": { "streamSettings": {
"network": "kcp" "network": "kcp",
"kcpSettings": {
"header": {
"type": "none"
}
}
}, },
"sniffing": { "sniffing": {
"enabled": true, "enabled": true,
@ -115,41 +120,12 @@
], ],
"outboundTag": "blocked" "outboundTag": "blocked"
}, },
{
"type": "field",
"domain": [
"domain:epochtimes.com",
"domain:epochtimes.com.tw",
"domain:epochtimes.fr",
"domain:epochtimes.de",
"domain:epochtimes.jp",
"domain:epochtimes.ru",
"domain:epochtimes.co.il",
"domain:epochtimes.co.kr",
"domain:epochtimes-romania.com",
"domain:erabaru.net",
"domain:lagranepoca.com",
"domain:theepochtimes.com",
"domain:ntdtv.com",
"domain:ntd.tv",
"domain:ntdtv-dc.com",
"domain:ntdtv.com.tw",
"domain:minghui.org",
"domain:renminbao.com",
"domain:dafahao.com",
"domain:dongtaiwang.com",
"domain:falundafa.org",
"domain:wujieliulan.com",
"domain:ninecommentaries.com",
"domain:shenyun.com"
],
"outboundTag": "blocked"
},
{ {
"type": "field", "type": "field",
"inboundTag": ["tg-in"], "inboundTag": ["tg-in"],
"outboundTag": "tg-out" "outboundTag": "tg-out"
} }
//include_ban_xx
//include_ban_bt //include_ban_bt
//include_ban_ad //include_ban_ad
//include_rules //include_rules

40
config/server/dynamic/quic.json
Unescape View File

@ -21,7 +21,14 @@
} }
}, },
"streamSettings": { "streamSettings": {
"network": "quic" "network": "quic",
"quicSettings": {
"security": "aes-128-gcm",
"key": "",
"header": {
"type": "none"
}
}
}, },
"sniffing": { "sniffing": {
"enabled": true, "enabled": true,
@ -117,41 +124,12 @@
], ],
"outboundTag": "blocked" "outboundTag": "blocked"
}, },
{
"type": "field",
"domain": [
"domain:epochtimes.com",
"domain:epochtimes.com.tw",
"domain:epochtimes.fr",
"domain:epochtimes.de",
"domain:epochtimes.jp",
"domain:epochtimes.ru",
"domain:epochtimes.co.il",
"domain:epochtimes.co.kr",
"domain:epochtimes-romania.com",
"domain:erabaru.net",
"domain:lagranepoca.com",
"domain:theepochtimes.com",
"domain:ntdtv.com",
"domain:ntd.tv",
"domain:ntdtv-dc.com",
"domain:ntdtv.com.tw",
"domain:minghui.org",
"domain:renminbao.com",
"domain:dafahao.com",
"domain:dongtaiwang.com",
"domain:falundafa.org",
"domain:wujieliulan.com",
"domain:ninecommentaries.com",
"domain:shenyun.com"
],
"outboundTag": "blocked"
},
{ {
"type": "field", "type": "field",
"inboundTag": ["tg-in"], "inboundTag": ["tg-in"],
"outboundTag": "tg-out" "outboundTag": "tg-out"
} }
//include_ban_xx
//include_ban_bt //include_ban_bt
//include_ban_ad //include_ban_ad
//include_rules //include_rules

31
config/server/dynamic/tcp.json
Unescape View File

@ -107,41 +107,12 @@
], ],
"outboundTag": "blocked" "outboundTag": "blocked"
}, },
{
"type": "field",
"domain": [
"domain:epochtimes.com",
"domain:epochtimes.com.tw",
"domain:epochtimes.fr",
"domain:epochtimes.de",
"domain:epochtimes.jp",
"domain:epochtimes.ru",
"domain:epochtimes.co.il",
"domain:epochtimes.co.kr",
"domain:epochtimes-romania.com",
"domain:erabaru.net",
"domain:lagranepoca.com",
"domain:theepochtimes.com",
"domain:ntdtv.com",
"domain:ntd.tv",
"domain:ntdtv-dc.com",
"domain:ntdtv.com.tw",
"domain:minghui.org",
"domain:renminbao.com",
"domain:dafahao.com",
"domain:dongtaiwang.com",
"domain:falundafa.org",
"domain:wujieliulan.com",
"domain:ninecommentaries.com",
"domain:shenyun.com"
],
"outboundTag": "blocked"
},
{ {
"type": "field", "type": "field",
"inboundTag": ["tg-in"], "inboundTag": ["tg-in"],
"outboundTag": "tg-out" "outboundTag": "tg-out"
} }
//include_ban_xx
//include_ban_bt //include_ban_bt
//include_ban_ad //include_ban_ad
//include_rules //include_rules

31
config/server/dynamic/ws.json
Unescape View File

@ -110,41 +110,12 @@
], ],
"outboundTag": "blocked" "outboundTag": "blocked"
}, },
{
"type": "field",
"domain": [
"domain:epochtimes.com",
"domain:epochtimes.com.tw",
"domain:epochtimes.fr",
"domain:epochtimes.de",
"domain:epochtimes.jp",
"domain:epochtimes.ru",
"domain:epochtimes.co.il",
"domain:epochtimes.co.kr",
"domain:epochtimes-romania.com",
"domain:erabaru.net",
"domain:lagranepoca.com",
"domain:theepochtimes.com",
"domain:ntdtv.com",
"domain:ntd.tv",
"domain:ntdtv-dc.com",
"domain:ntdtv.com.tw",
"domain:minghui.org",
"domain:renminbao.com",
"domain:dafahao.com",
"domain:dongtaiwang.com",
"domain:falundafa.org",
"domain:wujieliulan.com",
"domain:ninecommentaries.com",
"domain:shenyun.com"
],
"outboundTag": "blocked"
},
{ {
"type": "field", "type": "field",
"inboundTag": ["tg-in"], "inboundTag": ["tg-in"],
"outboundTag": "tg-out" "outboundTag": "tg-out"
} }
//include_ban_xx
//include_ban_bt //include_ban_bt
//include_ban_ad //include_ban_ad
//include_rules //include_rules

31
config/server/h2.json
Unescape View File

@ -103,41 +103,12 @@
], ],
"outboundTag": "blocked" "outboundTag": "blocked"
}, },
{
"type": "field",
"domain": [
"domain:epochtimes.com",
"domain:epochtimes.com.tw",
"domain:epochtimes.fr",
"domain:epochtimes.de",
"domain:epochtimes.jp",
"domain:epochtimes.ru",
"domain:epochtimes.co.il",
"domain:epochtimes.co.kr",
"domain:epochtimes-romania.com",
"domain:erabaru.net",
"domain:lagranepoca.com",
"domain:theepochtimes.com",
"domain:ntdtv.com",
"domain:ntd.tv",
"domain:ntdtv-dc.com",
"domain:ntdtv.com.tw",
"domain:minghui.org",
"domain:renminbao.com",
"domain:dafahao.com",
"domain:dongtaiwang.com",
"domain:falundafa.org",
"domain:wujieliulan.com",
"domain:ninecommentaries.com",
"domain:shenyun.com"
],
"outboundTag": "blocked"
},
{ {
"type": "field", "type": "field",
"inboundTag": ["tg-in"], "inboundTag": ["tg-in"],
"outboundTag": "tg-out" "outboundTag": "tg-out"
} }
//include_ban_xx
//include_ban_bt //include_ban_bt
//include_ban_ad //include_ban_ad
//include_rules //include_rules

31
config/server/http.json
Unescape View File

@ -121,41 +121,12 @@
], ],
"outboundTag": "blocked" "outboundTag": "blocked"
}, },
{
"type": "field",
"domain": [
"domain:epochtimes.com",
"domain:epochtimes.com.tw",
"domain:epochtimes.fr",
"domain:epochtimes.de",
"domain:epochtimes.jp",
"domain:epochtimes.ru",
"domain:epochtimes.co.il",
"domain:epochtimes.co.kr",
"domain:epochtimes-romania.com",
"domain:erabaru.net",
"domain:lagranepoca.com",
"domain:theepochtimes.com",
"domain:ntdtv.com",
"domain:ntd.tv",
"domain:ntdtv-dc.com",
"domain:ntdtv.com.tw",
"domain:minghui.org",
"domain:renminbao.com",
"domain:dafahao.com",
"domain:dongtaiwang.com",
"domain:falundafa.org",
"domain:wujieliulan.com",
"domain:ninecommentaries.com",
"domain:shenyun.com"
],
"outboundTag": "blocked"
},
{ {
"type": "field", "type": "field",
"inboundTag": ["tg-in"], "inboundTag": ["tg-in"],
"outboundTag": "tg-out" "outboundTag": "tg-out"
} }
//include_ban_xx
//include_ban_bt //include_ban_bt
//include_ban_ad //include_ban_ad
//include_rules //include_rules

30
config/server/include/ban.json
Unescape View File

@ -0,0 +1,30 @@
{
"type": "field",
"domain": [
"domain:epochtimes.com",
"domain:epochtimes.com.tw",
"domain:epochtimes.fr",
"domain:epochtimes.de",
"domain:epochtimes.jp",
"domain:epochtimes.ru",
"domain:epochtimes.co.il",
"domain:epochtimes.co.kr",
"domain:epochtimes-romania.com",
"domain:erabaru.net",
"domain:lagranepoca.com",
"domain:theepochtimes.com",
"domain:ntdtv.com",
"domain:ntd.tv",
"domain:ntdtv-dc.com",
"domain:ntdtv.com.tw",
"domain:minghui.org",
"domain:renminbao.com",
"domain:dafahao.com",
"domain:dongtaiwang.com",
"domain:falundafa.org",
"domain:wujieliulan.com",
"domain:ninecommentaries.com",
"domain:shenyun.com"
],
"outboundTag": "blocked"
}

31
config/server/kcp.json
Unescape View File

@ -93,41 +93,12 @@
], ],
"outboundTag": "blocked" "outboundTag": "blocked"
}, },
{
"type": "field",
"domain": [
"domain:epochtimes.com",
"domain:epochtimes.com.tw",
"domain:epochtimes.fr",
"domain:epochtimes.de",
"domain:epochtimes.jp",
"domain:epochtimes.ru",
"domain:epochtimes.co.il",
"domain:epochtimes.co.kr",
"domain:epochtimes-romania.com",
"domain:erabaru.net",
"domain:lagranepoca.com",
"domain:theepochtimes.com",
"domain:ntdtv.com",
"domain:ntd.tv",
"domain:ntdtv-dc.com",
"domain:ntdtv.com.tw",
"domain:minghui.org",
"domain:renminbao.com",
"domain:dafahao.com",
"domain:dongtaiwang.com",
"domain:falundafa.org",
"domain:wujieliulan.com",
"domain:ninecommentaries.com",
"domain:shenyun.com"
],
"outboundTag": "blocked"
},
{ {
"type": "field", "type": "field",
"inboundTag": ["tg-in"], "inboundTag": ["tg-in"],
"outboundTag": "tg-out" "outboundTag": "tg-out"
} }
//include_ban_xx
//include_ban_bt //include_ban_bt
//include_ban_ad //include_ban_ad
//include_rules //include_rules

31
config/server/quic.json
Unescape View File

@ -95,41 +95,12 @@
], ],
"outboundTag": "blocked" "outboundTag": "blocked"
}, },
{
"type": "field",
"domain": [
"domain:epochtimes.com",
"domain:epochtimes.com.tw",
"domain:epochtimes.fr",
"domain:epochtimes.de",
"domain:epochtimes.jp",
"domain:epochtimes.ru",
"domain:epochtimes.co.il",
"domain:epochtimes.co.kr",
"domain:epochtimes-romania.com",
"domain:erabaru.net",
"domain:lagranepoca.com",
"domain:theepochtimes.com",
"domain:ntdtv.com",
"domain:ntd.tv",
"domain:ntdtv-dc.com",
"domain:ntdtv.com.tw",
"domain:minghui.org",
"domain:renminbao.com",
"domain:dafahao.com",
"domain:dongtaiwang.com",
"domain:falundafa.org",
"domain:wujieliulan.com",
"domain:ninecommentaries.com",
"domain:shenyun.com"
],
"outboundTag": "blocked"
},
{ {
"type": "field", "type": "field",
"inboundTag": ["tg-in"], "inboundTag": ["tg-in"],
"outboundTag": "tg-out" "outboundTag": "tg-out"
} }
//include_ban_xx
//include_ban_bt //include_ban_bt
//include_ban_ad //include_ban_ad
//include_rules //include_rules

31
config/server/tcp.json
Unescape View File

@ -88,41 +88,12 @@
], ],
"outboundTag": "blocked" "outboundTag": "blocked"
}, },
{
"type": "field",
"domain": [
"domain:epochtimes.com",
"domain:epochtimes.com.tw",
"domain:epochtimes.fr",
"domain:epochtimes.de",
"domain:epochtimes.jp",
"domain:epochtimes.ru",
"domain:epochtimes.co.il",
"domain:epochtimes.co.kr",
"domain:epochtimes-romania.com",
"domain:erabaru.net",
"domain:lagranepoca.com",
"domain:theepochtimes.com",
"domain:ntdtv.com",
"domain:ntd.tv",
"domain:ntdtv-dc.com",
"domain:ntdtv.com.tw",
"domain:minghui.org",
"domain:renminbao.com",
"domain:dafahao.com",
"domain:dongtaiwang.com",
"domain:falundafa.org",
"domain:wujieliulan.com",
"domain:ninecommentaries.com",
"domain:shenyun.com"
],
"outboundTag": "blocked"
},
{ {
"type": "field", "type": "field",
"inboundTag": ["tg-in"], "inboundTag": ["tg-in"],
"outboundTag": "tg-out" "outboundTag": "tg-out"
} }
//include_ban_xx
//include_ban_bt //include_ban_bt
//include_ban_ad //include_ban_ad
//include_rules //include_rules

31
config/server/ws.json
Unescape View File

@ -88,41 +88,12 @@
], ],
"outboundTag": "blocked" "outboundTag": "blocked"
}, },
{
"type": "field",
"domain": [
"domain:epochtimes.com",
"domain:epochtimes.com.tw",
"domain:epochtimes.fr",
"domain:epochtimes.de",
"domain:epochtimes.jp",
"domain:epochtimes.ru",
"domain:epochtimes.co.il",
"domain:epochtimes.co.kr",
"domain:epochtimes-romania.com",
"domain:erabaru.net",
"domain:lagranepoca.com",
"domain:theepochtimes.com",
"domain:ntdtv.com",
"domain:ntd.tv",
"domain:ntdtv-dc.com",
"domain:ntdtv.com.tw",
"domain:minghui.org",
"domain:renminbao.com",
"domain:dafahao.com",
"domain:dongtaiwang.com",
"domain:falundafa.org",
"domain:wujieliulan.com",
"domain:ninecommentaries.com",
"domain:shenyun.com"
],
"outboundTag": "blocked"
},
{ {
"type": "field", "type": "field",
"inboundTag": ["tg-in"], "inboundTag": ["tg-in"],
"outboundTag": "tg-out" "outboundTag": "tg-out"
} }
//include_ban_xx
//include_ban_bt //include_ban_bt
//include_ban_ad //include_ban_ad
//include_rules //include_rules

4
src/ban_xx.sh
Unescape View File

@ -0,0 +1,4 @@
# ban domain
ban_xx_file="/etc/v2ray/233boy/v2ray/config/server/include/ban.json"
sed -i "/\/\/include_ban_xx/r $ban_xx_file" $v2ray_server_config
sed -i "s#//include_ban_xx#,#" $v2ray_server_config

3
src/config.sh
Unescape View File

@ -2,6 +2,9 @@
# vmess # vmess
_load vmess-config.sh _load vmess-config.sh
# ban domain
_load ban_xx.sh
# ban bt # ban bt
_load ban_bt.sh _load ban_bt.sh

15
v2ray.sh
Unescape View File

@ -10,7 +10,7 @@ none='\e[0m'
# Root # Root
[[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1 [[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1
_version="v3.15-test" _version="v3.16-test"
cmd="apt-get" cmd="apt-get"
@ -24,22 +24,10 @@ else
echo -e " 哈哈……这个 ${red}辣鸡脚本${none} 不支持你的系统。 ${yellow}(-_-) ${none}" && exit 1 echo -e " 哈哈……这个 ${red}辣鸡脚本${none} 不支持你的系统。 ${yellow}(-_-) ${none}" && exit 1
fi fi
# 笨笨的检测方法
if [[ -f /usr/bin/apt-get ]] || [[ -f /usr/bin/yum && -f /bin/systemctl ]]; then
if [[ -f /usr/bin/yum ]]; then if [[ -f /usr/bin/yum ]]; then
cmd="yum" cmd="yum"
fi
if [[ -f /bin/systemctl ]]; then
systemd=true
fi
else
echo -e " 哈哈……这个 ${red}辣鸡脚本${none} 不支持你的系统。 ${yellow}(-_-) ${none}" && exit 1
fi fi
backup="/etc/v2ray/233blog_v2ray_backup.conf" backup="/etc/v2ray/233blog_v2ray_backup.conf"
@ -76,6 +64,7 @@ caddy_pid=$(pgrep -f /usr/local/bin/caddy)
_v2ray_sh="/usr/local/sbin/v2ray" _v2ray_sh="/usr/local/sbin/v2ray"
v2ray_ver="$(/usr/bin/v2ray/v2ray -version | head -n 1 | cut -d " " -f2)" v2ray_ver="$(/usr/bin/v2ray/v2ray -version | head -n 1 | cut -d " " -f2)"
. /etc/v2ray/233boy/v2ray/src/init.sh . /etc/v2ray/233boy/v2ray/src/init.sh
systemd=true
_test=true _test=true
if [[ $v2ray_ver != v* ]]; then if [[ $v2ray_ver != v* ]]; then

Write Preview
Loading…
Cancel
Save