zhk-gitea/v2ray
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
233boy
2019-02-17 23:15:24 +08:00
parent e9ab14add2
commit 9d6febc8b2
15 changed files with 81 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/server/dynamic/http.json
View File

@@ -91,7 +91,7 @@
//include_ss //include_ss
//include_socks //include_socks
//include_mtproto //include_mtproto
//include_config //include_in_config
// //
], ],
"outbounds": [ "outbounds": [
@@ -114,13 +114,15 @@
"settings": {}, "settings": {},
"tag": "tg-out" "tag": "tg-out"
} }
//include_out_config
//
], ],
"dns": { "dns": {
"server": [ "server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1", "1.1.1.1",
"1.0.0.1", "1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost" "localhost"
] ]
}, },

8
config/server/dynamic/kcp.json
View File

@@ -63,7 +63,7 @@
//include_ss //include_ss
//include_socks //include_socks
//include_mtproto //include_mtproto
//include_config //include_in_config
// //
], ],
"outbounds": [ "outbounds": [
@@ -86,13 +86,15 @@
"settings": {}, "settings": {},
"tag": "tg-out" "tag": "tg-out"
} }
//include_out_config
//
], ],
"dns": { "dns": {
"server": [ "server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1", "1.1.1.1",
"1.0.0.1", "1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost" "localhost"
] ]
}, },

8
config/server/dynamic/quic.json
View File

@@ -67,7 +67,7 @@
//include_ss //include_ss
//include_socks //include_socks
//include_mtproto //include_mtproto
//include_config //include_in_config
// //
], ],
"outbounds": [ "outbounds": [
@@ -90,13 +90,15 @@
"settings": {}, "settings": {},
"tag": "tg-out" "tag": "tg-out"
} }
//include_out_config
//
], ],
"dns": { "dns": {
"server": [ "server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1", "1.1.1.1",
"1.0.0.1", "1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost" "localhost"
] ]
}, },

8
config/server/dynamic/tcp.json
View File

@@ -50,7 +50,7 @@
//include_ss //include_ss
//include_socks //include_socks
//include_mtproto //include_mtproto
//include_config //include_in_config
// //
], ],
"outbounds": [ "outbounds": [
@@ -73,13 +73,15 @@
"settings": {}, "settings": {},
"tag": "tg-out" "tag": "tg-out"
} }
//include_out_config
//
], ],
"dns": { "dns": {
"server": [ "server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1", "1.1.1.1",
"1.0.0.1", "1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost" "localhost"
] ]
}, },

8
config/server/dynamic/ws.json
View File

@@ -53,7 +53,7 @@
//include_ss //include_ss
//include_socks //include_socks
//include_mtproto //include_mtproto
//include_config //include_in_config
// //
], ],
"outbounds": [ "outbounds": [
@@ -76,13 +76,15 @@
"settings": {}, "settings": {},
"tag": "tg-out" "tag": "tg-out"
} }
//include_out_config
//
], ],
"dns": { "dns": {
"server": [ "server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1", "1.1.1.1",
"1.0.0.1", "1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost" "localhost"
] ]
}, },

8
config/server/h2.json
View File

@@ -46,7 +46,7 @@
//include_ss //include_ss
//include_socks //include_socks
//include_mtproto //include_mtproto
//include_config //include_in_config
// //
], ],
"outbounds": [ "outbounds": [
@@ -69,13 +69,15 @@
"settings": {}, "settings": {},
"tag": "tg-out" "tag": "tg-out"
} }
//include_out_config
//
], ],
"dns": { "dns": {
"server": [ "server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1", "1.1.1.1",
"1.0.0.1", "1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost" "localhost"
] ]
}, },

8
config/server/http.json
View File

@@ -64,7 +64,7 @@
//include_ss //include_ss
//include_socks //include_socks
//include_mtproto //include_mtproto
//include_config //include_in_config
// //
], ],
"outbounds": [ "outbounds": [
@@ -87,13 +87,15 @@
"settings": {}, "settings": {},
"tag": "tg-out" "tag": "tg-out"
} }
//include_out_config
//
], ],
"dns": { "dns": {
"server": [ "server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1", "1.1.1.1",
"1.0.0.1", "1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost" "localhost"
] ]
}, },

8
config/server/kcp.json
View File

@@ -36,7 +36,7 @@
//include_ss //include_ss
//include_socks //include_socks
//include_mtproto //include_mtproto
//include_config //include_in_config
// //
], ],
"outbounds": [ "outbounds": [
@@ -59,13 +59,15 @@
"settings": {}, "settings": {},
"tag": "tg-out" "tag": "tg-out"
} }
//include_out_config
//
], ],
"dns": { "dns": {
"server": [ "server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1", "1.1.1.1",
"1.0.0.1", "1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost" "localhost"
] ]
}, },

8
config/server/quic.json
View File

@@ -38,7 +38,7 @@
//include_ss //include_ss
//include_socks //include_socks
//include_mtproto //include_mtproto
//include_config //include_in_config
// //
], ],
"outbounds": [ "outbounds": [
@@ -61,13 +61,15 @@
"settings": {}, "settings": {},
"tag": "tg-out" "tag": "tg-out"
} }
//include_out_config
//
], ],
"dns": { "dns": {
"server": [ "server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1", "1.1.1.1",
"1.0.0.1", "1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost" "localhost"
] ]
}, },

8
config/server/tcp.json
View File

@@ -31,7 +31,7 @@
//include_ss //include_ss
//include_socks //include_socks
//include_mtproto //include_mtproto
//include_config //include_in_config
// //
], ],
"outbounds": [ "outbounds": [
@@ -54,13 +54,15 @@
"settings": {}, "settings": {},
"tag": "tg-out" "tag": "tg-out"
} }
//include_out_config
//
], ],
"dns": { "dns": {
"server": [ "server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1", "1.1.1.1",
"1.0.0.1", "1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost" "localhost"
] ]
}, },

8
config/server/ws.json
View File

@@ -31,7 +31,7 @@
//include_ss //include_ss
//include_socks //include_socks
//include_mtproto //include_mtproto
//include_config //include_in_config
// //
], ],
"outbounds": [ "outbounds": [
@@ -54,13 +54,15 @@
"settings": {}, "settings": {},
"tag": "tg-out" "tag": "tg-out"
} }
//include_out_config
//
], ],
"dns": { "dns": {
"server": [ "server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1", "1.1.1.1",
"1.0.0.1", "1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost" "localhost"
] ]
}, },

20
src/config.sh
View File

@@ -1,6 +1,14 @@
# vmess # vmess
_load vmess-config.sh _load vmess-config.sh
# ss
_load ss-config.sh
# socks
_load socks-config.sh
# mtproto
_load mtproto-config.sh
# ban domain # ban domain
_load ban_xx.sh _load ban_xx.sh
@@ -11,17 +19,5 @@ _load ban_bt.sh
# ban ad # ban ad
_load ban_ad.sh _load ban_ad.sh
# custom rules
_load custom_rules.sh
# ss
_load ss-config.sh
# socks
_load socks-config.sh
# mtproto
_load mtproto-config.sh
# custom config # custom config
_load custom_config.sh _load custom_config.sh

22
src/custom_config.sh
View File

@@ -1,6 +1,18 @@
# custom config # custom inbounds config
if [[ -f /etc/v2ray/custom/config.json ]]; then if [[ -f /etc/v2ray/custom/in.json ]]; then
custom_config_file="/etc/v2ray/custom/config.json" custom_config_file="/etc/v2ray/custom/in.json"
sed -i "/\/\/include_config/r $custom_config_file" $v2ray_server_config sed -i "/\/\/include_in_config/r $custom_config_file" $v2ray_server_config
sed -i "s#//include_config#,#" $v2ray_server_config sed -i "s#//include_in_config#,#" $v2ray_server_config
fi
# custom outbounds config
if [[ -f /etc/v2ray/custom/out.json ]]; then
custom_config_file="/etc/v2ray/custom/out.json"
sed -i "/\/\/include_out_config/r $custom_config_file" $v2ray_server_config
sed -i "s#//include_out_config#,#" $v2ray_server_config
fi
# custom rules
if [[ -f /etc/v2ray/custom/rules.json ]]; then
custom_rules_file="/etc/v2ray/custom/rules.json"
sed -i "/\/\/include_rules/r $custom_rules_file" $v2ray_server_config
sed -i "s#//include_rules#,#" $v2ray_server_config
fi fi

6
src/custom_rules.sh
View File

@@ -1,6 +0,0 @@
# custom rules
if [[ -f /etc/v2ray/custom/rules.json ]]; then
custom_rules_file="/etc/v2ray/custom/rules.json"
sed -i "/\/\/include_rules/r $custom_rules_file" $v2ray_server_config
sed -i "s#//include_rules#,#" $v2ray_server_config
fi

2
v2ray.sh
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.05" _version="v3.06"
cmd="apt-get" cmd="apt-get"