2gW94/server-xray
1
0
Fork 0
mirror of https://github.com/samuelhbne/server-xray.git synced 2025-12-17 12:24:39 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Subcommand scripts renamed

Browse Source
This commit is contained in:
Samuel Huang
2024-08-25 18:09:10 +10:00
parent ecac780b4f
commit ee915a6f36
2 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Dockerfile
View File

@@ -16,28 +16,39 @@ ARG ACMEVER='2.9.0'
COPY --from=builder /go/src/XTLS/Xray-core/xray /usr/local/bin/
RUN apk add --no-cache bash openssl curl socat jq moreutils
RUN apk add --no-cache bash openssl curl socat jq moreutils libcap-setcap
RUN cd /root; curl -sSL "https://github.com/acmesh-official/acme.sh/archive/refs/tags/${ACMEVER}.tar.gz"|tar zxvf -
RUN cd /root; ln -s acme.sh-${ACMEVER} acme.sh; mkdir .acme.sh
RUN setcap CAP_NET_BIND_SERVICE=+eip /usr/sbin/nginx
COPY site-ssl.conf.tpl /etc/nginx/conf.d/
COPY nginx-proxy.tpl /etc/nginx/conf.d/
COPY nginx-grpc.tpl /etc/nginx/conf.d/
COPY nginx-ws.tpl /etc/nginx/conf.d/
ADD server-lx.sh /server-lx.sh
ADD server-ls.sh /server-ls.sh
ADD server-ms.sh /server-ms.sh
ADD server-ts.sh /server-ts.sh
ADD server-lsw.sh /server-lsw.sh
ADD server-lsg.sh /server-lsg.sh
ADD server-lss.sh /server-lss.sh
ADD server-msw.sh /server-msw.sh
ADD server-tsw.sh /server-tsw.sh
ADD server-lpw.sh /server-lpw.sh
ADD server-lpg.sh /server-lpg.sh
ADD server-lps.sh /server-lps.sh
ADD server-mpw.sh /server-mpw.sh
ADD server-tpw.sh /server-tpw.sh
COPY site-ssl.conf.tpl /etc/nginx/http.d/
COPY grpc.tpl /etc/nginx/http.d/
COPY ws.tpl /etc/nginx/http.d/
ADD run.sh /run.sh
ADD server-ltx.sh /server-ltx.sh
ADD server-ltt.sh /server-ltt.sh
ADD server-lttw.sh /server-lttw.sh
ADD server-ltpw.sh /server-ltpw.sh
ADD server-mtt.sh /server-mtt.sh
ADD server-mttw.sh /server-mttw.sh
ADD server-mtpw.sh /server-mtpw.sh
ADD server-ttt.sh /server-ttt.sh
ADD server-tttw.sh /server-tttw.sh
ADD server-ttpw.sh /server-ttpw.sh
ADD server-lttg.sh /server-lttg.sh
ADD server-ltpg.sh /server-ltpg.sh
ADD server-nginx.sh /server-nginx.sh
ADD run.sh /run.sh
RUN chmod 755 /*.sh
ENTRYPOINT ["/run.sh"]

14
server-nginx.sh
View File

@@ -40,10 +40,10 @@ if [ -z "${NGOPT}" ]; then usage; exit 1; fi
if [ -z "${NGPROXY}" ]; then usage; exit 1; fi
# Running as root to enable low port listening. Necessary for Fargate or k8s.
sed -i 's/^user nginx;$/user root;/g' /etc/nginx/nginx.conf
# sed -i 's/^user nginx;$/user root;/g' /etc/nginx/nginx.conf
mkdir -p /run/nginx/
cd /etc/nginx/http.d/
if [ -f /etc/nginx/http.d/default.conf ]; then
cd /etc/nginx/conf.d/
if [ -f /etc/nginx/conf.d/default.conf ]; then
mv default.conf default.conf.disable
fi
@@ -117,12 +117,12 @@ do
esac
done
if [ -z "${xport}" ]; then echo "Missing port: $ngproxy"; usage; exit 1; fi
if ! [ "${xport}" -eq "${xport}" ] 2>/dev/null; then >&2 echo "Port number must be numeric"; exit 1; fi
if [ -z "${xnetwork}" ]; then echo "Missing network: $ngproxy"; usage; exit 1; fi
if [ -z "${xlocation}" ]; then echo "Missing location: $ngproxy"; usage; exit 1; fi
if [ -z "${xhost}" ]; then xhost="127.0.0.1"; fi
if [ -z "${xdomain}" ]; then xdomain=("${DOMAIN[@]}"); fi
if [ -z "${xnetwork}" ]; then echo "Missing network: $ngproxy"; usage; exit 1; fi
if [ -z "${xlocation}" ]; then echo "Missing location: $ngproxy"; usage; exit 1; fi
if [ -z "${xport}" ]; then echo "Missing port: $ngproxy"; usage; exit 1; fi
if ! [ "${xport}" -eq "${xport}" ] 2>/dev/null; then >&2 echo "Port number must be numeric"; exit 1; fi
for domain in "${xdomain[@]}"
do