Skip to content

Commit

Permalink
Merge pull request Snawoot#2 from Snawoot/no_proxy
Browse files Browse the repository at this point in the history
remove ProxySite option; remove static files
  • Loading branch information
Snawoot authored May 6, 2021
2 parents 89108bf + 84f4996 commit ef65aee
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 22 deletions.
Binary file removed Backupwwwroot.tar.gz
Binary file not shown.
3 changes: 0 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ FROM debian:sid

ARG V2RAY_VERSION=v1.3.1

COPY wwwroot.tar.gz /wwwroot/wwwroot.tar.gz
COPY conf/ /conf
COPY entrypoint.sh /entrypoint.sh

Expand All @@ -15,8 +14,6 @@ RUN set -ex\
&& apt install -y nginx-light \
&& apt autoremove -y \
&& apt clean -y \
&& tar xvf /wwwroot/wwwroot.tar.gz -C /wwwroot \
&& rm -rf /wwwroot/wwwroot.tar.gz \
&& chmod +x /entrypoint.sh \
&& mkdir -p /etc/shadowsocks-libev /v2raybin \
&& wget -O- "https://github.com/shadowsocks/v2ray-plugin/releases/download/${V2RAY_VERSION}/v2ray-plugin-linux-amd64-${V2RAY_VERSION}.tar.gz" | \
Expand Down
9 changes: 1 addition & 8 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,7 @@
"QR_Path": {
"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": "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",
"required": false
}

}
},
"website": "",
"repository": "",
Expand Down
12 changes: 1 addition & 11 deletions conf/nginx_ss.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,8 @@ server {
root /wwwroot;
resolver 8.8.8.8:53;
location / {
EOF

if [[ "${ProxySite}" ]]; then
cat << EOF
proxy_pass https://${ProxySite};
EOF
>&2 echo "site:use local wwwroot html"
fi

cat <<EOF
return 403;
}
location ${QR_Path} {
root /wwwroot;
Expand Down
Binary file removed wwwroot.tar.gz
Binary file not shown.

0 comments on commit ef65aee

Please sign in to comment.