Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
233boy committed Feb 17, 2019
1 parent e9ab14a commit 9d6febc
Show file tree
Hide file tree
Showing 15 changed files with 81 additions and 57 deletions.
8 changes: 5 additions & 3 deletions config/server/dynamic/http.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
//include_ss
//include_socks
//include_mtproto
//include_config
//include_in_config
//
],
"outbounds": [
Expand All @@ -114,13 +114,15 @@
"settings": {},
"tag": "tg-out"
}
//include_out_config
//
],
"dns": {
"server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost"
]
},
Expand Down
8 changes: 5 additions & 3 deletions config/server/dynamic/kcp.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
//include_ss
//include_socks
//include_mtproto
//include_config
//include_in_config
//
],
"outbounds": [
Expand All @@ -86,13 +86,15 @@
"settings": {},
"tag": "tg-out"
}
//include_out_config
//
],
"dns": {
"server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost"
]
},
Expand Down
8 changes: 5 additions & 3 deletions config/server/dynamic/quic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
//include_ss
//include_socks
//include_mtproto
//include_config
//include_in_config
//
],
"outbounds": [
Expand All @@ -90,13 +90,15 @@
"settings": {},
"tag": "tg-out"
}
//include_out_config
//
],
"dns": {
"server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost"
]
},
Expand Down
8 changes: 5 additions & 3 deletions config/server/dynamic/tcp.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
//include_ss
//include_socks
//include_mtproto
//include_config
//include_in_config
//
],
"outbounds": [
Expand All @@ -73,13 +73,15 @@
"settings": {},
"tag": "tg-out"
}
//include_out_config
//
],
"dns": {
"server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost"
]
},
Expand Down
8 changes: 5 additions & 3 deletions config/server/dynamic/ws.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
//include_ss
//include_socks
//include_mtproto
//include_config
//include_in_config
//
],
"outbounds": [
Expand All @@ -76,13 +76,15 @@
"settings": {},
"tag": "tg-out"
}
//include_out_config
//
],
"dns": {
"server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost"
]
},
Expand Down
8 changes: 5 additions & 3 deletions config/server/h2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
//include_ss
//include_socks
//include_mtproto
//include_config
//include_in_config
//
],
"outbounds": [
Expand All @@ -69,13 +69,15 @@
"settings": {},
"tag": "tg-out"
}
//include_out_config
//
],
"dns": {
"server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost"
]
},
Expand Down
8 changes: 5 additions & 3 deletions config/server/http.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
//include_ss
//include_socks
//include_mtproto
//include_config
//include_in_config
//
],
"outbounds": [
Expand All @@ -87,13 +87,15 @@
"settings": {},
"tag": "tg-out"
}
//include_out_config
//
],
"dns": {
"server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost"
]
},
Expand Down
8 changes: 5 additions & 3 deletions config/server/kcp.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
//include_ss
//include_socks
//include_mtproto
//include_config
//include_in_config
//
],
"outbounds": [
Expand All @@ -59,13 +59,15 @@
"settings": {},
"tag": "tg-out"
}
//include_out_config
//
],
"dns": {
"server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost"
]
},
Expand Down
8 changes: 5 additions & 3 deletions config/server/quic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
//include_ss
//include_socks
//include_mtproto
//include_config
//include_in_config
//
],
"outbounds": [
Expand All @@ -61,13 +61,15 @@
"settings": {},
"tag": "tg-out"
}
//include_out_config
//
],
"dns": {
"server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost"
]
},
Expand Down
8 changes: 5 additions & 3 deletions config/server/tcp.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
//include_ss
//include_socks
//include_mtproto
//include_config
//include_in_config
//
],
"outbounds": [
Expand All @@ -54,13 +54,15 @@
"settings": {},
"tag": "tg-out"
}
//include_out_config
//
],
"dns": {
"server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost"
]
},
Expand Down
8 changes: 5 additions & 3 deletions config/server/ws.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
//include_ss
//include_socks
//include_mtproto
//include_config
//include_in_config
//
],
"outbounds": [
Expand All @@ -54,13 +54,15 @@
"settings": {},
"tag": "tg-out"
}
//include_out_config
//
],
"dns": {
"server": [
"8.8.8.8",
"8.8.4.4",
"1.1.1.1",
"1.0.0.1",
"8.8.8.8",
"8.8.4.4",
"localhost"
]
},
Expand Down
20 changes: 8 additions & 12 deletions src/config.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@

# vmess
_load vmess-config.sh
# ss
_load ss-config.sh

# socks
_load socks-config.sh

# mtproto
_load mtproto-config.sh

# ban domain
_load ban_xx.sh
Expand All @@ -11,17 +19,5 @@ _load ban_bt.sh
# ban ad
_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
_load custom_config.sh
22 changes: 17 additions & 5 deletions src/custom_config.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
# custom config
if [[ -f /etc/v2ray/custom/config.json ]]; then
custom_config_file="/etc/v2ray/custom/config.json"
sed -i "/\/\/include_config/r $custom_config_file" $v2ray_server_config
sed -i "s#//include_config#,#" $v2ray_server_config
# custom inbounds config
if [[ -f /etc/v2ray/custom/in.json ]]; then
custom_config_file="/etc/v2ray/custom/in.json"
sed -i "/\/\/include_in_config/r $custom_config_file" $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
6 changes: 0 additions & 6 deletions src/custom_rules.sh
View file

This file was deleted.

2 changes: 1 addition & 1 deletion v2ray.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ none='\e[0m'
# Root
[[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1

_version="v3.05"
_version="v3.06"

cmd="apt-get"

Expand Down

0 comments on commit 9d6febc

Please sign in to comment.