Merge pull request Snawoot#3 from Snawoot/auto_v2path

Autogenerate v2path
sfalexrog · May 6, 2021 · 089586f · 089586f
2 parents ef65aee + ef7b40f
commit 089586f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,7 @@ RUN set -ex\
     && apt autoremove -y \
     && apt clean -y \
     && chmod +x /entrypoint.sh \
-    && mkdir -p /etc/shadowsocks-libev /v2raybin \
+    && mkdir -p /etc/shadowsocks-libev /v2raybin /wwwroot \
     && wget -O- "https://github.com/shadowsocks/v2ray-plugin/releases/download/${V2RAY_VERSION}/v2ray-plugin-linux-amd64-${V2RAY_VERSION}.tar.gz" | \
         tar zx -C /v2raybin \
     && install /v2raybin/v2ray-plugin_linux_amd64 /usr/bin/v2ray-plugin \

diff --git a/app.json b/app.json
@@ -4,7 +4,7 @@
   "keywords": ["V2ray", "Shadowsocks", "V2Ray-plugin"],
   "env": {
      "ENCRYPT": {
-      "description": "Encryption method, due to https blessing, choose the simplest one, default: chacha20-ietf-poly1305, others are（aes-256-cfb,chacha20-ietf-poly1305,salsa20,chacha20-ietf etc.）",
+      "description": "Shadowsocks encryption method.",
       "value": "chacha20-ietf-poly1305"
     },
      "PASSWORD": {
@@ -13,12 +13,12 @@
     },
 
      "V2_Path": {
-      "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"
+      "description": "V2Ray handler path. Auto-generated with some secret value.",
+      "generator": "secret"
     },
 
      "AppName": {
-      "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",
+      "description": "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"
     },
 

diff --git a/conf/nginx_ss.conf b/conf/nginx_ss.conf
@@ -12,7 +12,7 @@ server {
     location ${QR_Path} {
         root /wwwroot;
     }
-    location = ${V2_Path} {
+    location = /${V2_Path} {
         if (\$http_upgrade != "websocket") { # WebSocket return this when negotiation fails 404
             return 404;
         }

diff --git a/conf/shadowsocks-libev_config.json b/conf/shadowsocks-libev_config.json
@@ -12,6 +12,6 @@ cat <<EOF
     "reuse_port":true,
     "no_delay":true,
     "plugin": "v2ray-plugin",
-    "plugin_opts":"server;path=${V2_Path}"
+    "plugin_opts":"server;path=/${V2_Path}"
 }
 EOF
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -10,7 +10,7 @@ if [[ -z "${ENCRYPT}" ]]; then
 fi
 
 if [[ -z "${V2_Path}" ]]; then
-  export V2_Path="/s233"
+  export V2_Path="s233"
 fi
 echo ${V2_Path}
 
@@ -32,7 +32,7 @@ if [ "$AppName" = "no" ]; then
   echo "Do not generate QR-code"
 else
   [ ! -d /wwwroot/${QR_Path} ] && mkdir /wwwroot/${QR_Path}
-  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')
+  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}/vpn.png