diff --git a/install.sh b/install.sh index 2ed5244..84a1900 100644 --- a/install.sh +++ b/install.sh @@ -629,7 +629,11 @@ shadowsocks_ciphers_config() { } ssray_config() { - + echo + echo + echo + echo + echo echo while :; do @@ -750,7 +754,7 @@ ssray_proto_config() { done } -do_install_ssray() { +install_ssray() { _load download-ssray.sh _download_ssray_file _install_ssray_service @@ -812,7 +816,7 @@ install_info() { echo echo -e "$yellow Shadowsocks 加密协议 = $cyan${ssciphers}$none" - if [[ $install_ssray ]]; then + if [[ $ssray ]]; then echo echo -e "$yellow v2ray-plugin 端口 = $cyan$ssrayport$none" echo @@ -1023,7 +1027,7 @@ config() { if [[ $shadowsocks ]]; then open_port $ssport - if [[ $install_ssray ]]; then + if [[ $ssray ]]; then open_port $ssrayport do_service restart ssray fi @@ -1150,7 +1154,7 @@ install() { fi fi [[ $caddy ]] && install_caddy - [[ $install_ssray ]] && do_install_ssray + [[ $ssray ]] && install_ssray get_ip config show_config_info diff --git a/src/ss-config.sh b/src/ss-config.sh index 2e85d06..0007d6e 100644 --- a/src/ss-config.sh +++ b/src/ss-config.sh @@ -9,7 +9,7 @@ if [[ $shadowsocks ]]; then rm -rf $ss_file_tmp - if [[ $install_ssray ]]; then + if [[ $ssray ]]; then ssray_conf=/etc/v2ray/233boy/ssray.conf sed -i "s/##REMOTEPORT##/${ssrayport}/; s/##LOCALPORT##/${ssport}/; s/##OPTION##/${ssrayopt}/;" $ssray_conf fi diff --git a/src/ssray.service b/src/ssray.service index d5a685b..adfe08f 100644 --- a/src/ssray.service +++ b/src/ssray.service @@ -12,7 +12,7 @@ User=root Group=root EnvironmentFile=/etc/v2ray/233boy/ssray.conf -ExecStart=/usr/local/bin/v2ray-plugin +ExecStart=/usr/local/bin/v2ray-plugin -cert /etc/v2ray/233boy/v2ray/config/233blog.com.cer -key /etc/v2ray/233boy/v2ray/config/233blog.com.key ExecReload=/bin/kill -USR1 $MAINPID ; Use graceful shutdown with a reasonable timeout diff --git a/tools/v3.sh b/tools/v3.sh index 17d14b6..5b8ecdc 100644 --- a/tools/v3.sh +++ b/tools/v3.sh @@ -74,6 +74,9 @@ sspass=$sspass #---- Shadowsocks 加密协议 ----- ssciphers=$ssciphers +#---- Shadowsocks V2ray ----- +ssray=$ssray_status + #---- Shadowsocks V2ray-plugin 端口 ----- ssrayport=$ssrayport