diff --git a/app.json b/app.json index 9b1c4d2..432137b 100644 --- a/app.json +++ b/app.json @@ -1,39 +1,39 @@ { - "name": "Shadowsocks+V2Ray-plugin快速部署", + "name": "Shadowsocks+V2Ray-plugin Rapid deployment", "description": "Deploy Shadowsocks+V2Ray-plugin to Heroku.", "keywords": ["V2ray", "Shadowsocks", "V2Ray-plugin"], "env": { "ENCRYPT": { - "description": "加密方式,由于有https加持,选最简单的就可以,默认:rc4-md5,其它的有(aes-256-cfb,chacha20-ietf-poly1305,salsa20,chacha20-ietf等.)", + "description": "Encryption method, due to https blessing, choose the simplest one, default: rc4-md5, others are(aes-256-cfb,chacha20-ietf-poly1305,salsa20,chacha20-ietf etc.)", "value": "rc4-md5" }, "PASSWORD": { - "description": "shadowsocks的密码,可以使用uuid作为密码(http://www.uuid.online/在线生成)", + "description": "The password of shadowsocks, you can use uuid as the password (http://www.uuid.online/ online generation)", "value": "5c301bb8-6c77-41a0-a606-4ba11bbab084" }, "VER": { - "description": "v2ray-plugin版本,默认latest安装最新版本,可以去https://github.com/shadowsocks/v2ray-plugin/releasesV2Ray选择版本 (例如:1.1.0)", + "description": "v2ray-plugin version, the latest version is installed by default, you can go to https://github.com/shadowsocks/v2ray-plugin/releasesV2Ray to select the version (for example: 1.1.0)", "value": "latest" }, "V2_Path": { - "description": "Path路径,默认/s233,为了安全你也可以使用uuid替换s233,/不能少。如果开启反代,不要与反代uri重复", + "description": "Path path, default /s233, you can also replace s233 with uuid for safety, / cannot be less. If anti-generation is turned on, do not repeat with anti-generation uri", "value": "/s233" }, "AppName": { - "description": "请输入最上方填写的App Name,用于生成配置和二维码,如果不想生成输入no", + "description": "Please enter the App Name filled in at the top to generate the configuration and QR code. If you don’t want to generate it, enter no", "value": "no" }, "QR_Path": { - "description": "二维码和配置链接路径,默认qr_img,为了保密性你也可以使用uuid,但是不能与V2_Path相同。如AppName变量为no,此变量没有作用", - "value": "/qr_img" + "description": "QR code and configuration link path, the default qr_img, you can also use uuid for confidentiality, but it cannot be the same as V2_Path. If the AppName variable is no, this variable has no effect", + "value": "/qr" }, "ProxySite": { - "description": "反代一个网站,例如:www.ietf.org,不填写表示使用本地静态网页文件。", + "description": "Replacing a website, for example: www.ietf.org, if you don’t fill in it means to use a local static webpage file.", "value": "www.ietf.org" } diff --git a/conf/nginx_ss.conf b/conf/nginx_ss.conf index c7f4d86..b1cf323 100644 --- a/conf/nginx_ss.conf +++ b/conf/nginx_ss.conf @@ -1,4 +1,4 @@ -# 顶格注释内容在sed处理时将被剔除,不会出现在最后的配置文件中 +# The content of the top grid comment will be removed during sed processing and will not appear in the final configuration file server { listen ${PORT}; @@ -14,7 +14,7 @@ server { root /wwwroot; } location = ${V2_Path} { - if ($http_upgrade != "websocket") { # WebSocket协商失败时返回404 + if ($http_upgrade != "websocket") { # WebSocket return this when negotiation fails 404 return 404; } proxy_redirect off; diff --git a/conf/shadowsocks-libev_config.json b/conf/shadowsocks-libev_config.json index 6eca704..bc67b2f 100644 --- a/conf/shadowsocks-libev_config.json +++ b/conf/shadowsocks-libev_config.json @@ -1,5 +1,5 @@ -# 顶格注释内容在sed处理时将被剔除,不会出现在最后的配置文件中 -# 在heroku上fast_open必须为false +# The content of the top grid comment will be removed during sed processing and will not appear in the final configuration file +# Fast_open must be false on heroku { "server":"127.0.0.1", "server_port":"2333", diff --git a/entrypoint.sh b/entrypoint.sh index 1bf73fd..aa5c1e6 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -86,7 +86,7 @@ else plugin=$(echo -n "v2ray;path=${V2_Path};host=${AppName}.herokuapp.com;tls" | sed -e 's/\//%2F/g' -e 's/=/%3D/g' -e 's/;/%3B/g') ss="ss://$(echo -n ${ENCRYPT}:${PASSWORD} | base64 -w 0)@${AppName}.herokuapp.com:443?plugin=${plugin}" echo "${ss}" | tr -d '\n' > /wwwroot/${QR_Path}/index.html - echo -n "${ss}" | qrencode -s 6 -o /wwwroot/${QR_Path}/v2.png + echo -n "${ss}" | qrencode -s 6 -o /wwwroot/${QR_Path}/vpn.png fi ss-server -c /etc/shadowsocks-libev/config.json &