pull/124/head
BOYPT 7 years ago
parent 1d4de3b30a
commit 62f6af8653
  1. 14
      install.sh
  2. 2
      src/ss-config.sh
  3. 2
      src/ssray.service
  4. 3
      tools/v3.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

@ -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

@ -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

@ -74,6 +74,9 @@ sspass=$sspass
#---- Shadowsocks 加密协议 -----
ssciphers=$ssciphers
#---- Shadowsocks V2ray -----
ssray=$ssray_status
#---- Shadowsocks V2ray-plugin 端口 -----
ssrayport=$ssrayport

Loading…
Cancel
Save