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

Codacy compliant

Browse Source
This commit is contained in:
Samuel Huang
2024-10-01 08:20:43 +10:00
parent 614d53e540
commit 368a9c36e0
17 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
run.sh
View File

@@ -78,13 +78,13 @@ while true ; do
;; ;;
--lgp|--lgr|--lgt|--lsp|--lst|--ltr|--ltt|--lwp|--lwt|--mtt|--mwp|--mwt|--ttt|--twp|--twt) --lgp|--lgr|--lgt|--lsp|--lst|--ltr|--ltt|--lwp|--lwt|--mtt|--mwp|--mwt|--ttt|--twp|--twt)
# Alias options # Alias options
SVC=$(echo $1|tr -d '\-\-') SVC=$(echo "$1"|tr -d "\-\-")
SVCMD+=("${DIR}/server-${SVC}.sh $2") SVCMD+=("${DIR}/server-${SVC}.sh $2")
shift 2 shift 2
;; ;;
--ltrx|--lttx) --ltrx|--lttx)
# Alias options # Alias options
SVC=$(echo $1|tr -d '\-\-'|tr -d x) SVC=$(echo "$1"|tr -d "\-\-"|tr -d "x")
SVCMD+=("${DIR}/server-${SVC}.sh $2,xtls") SVCMD+=("${DIR}/server-${SVC}.sh $2,xtls")
shift 2 shift 2
;; ;;
@@ -156,7 +156,7 @@ if [ "${#CERTDOMAIN[@]}" -gt 0 ]; then
do do
echo "Requesting TLS cert for ${DOMAIN} ..." echo "Requesting TLS cert for ${DOMAIN} ..."
echo "/root/acme.sh/acme.sh --cert-home ${CERTHOME} --issue --standalone -d ${DOMAIN} --debug" echo "/root/acme.sh/acme.sh --cert-home ${CERTHOME} --issue --standalone -d ${DOMAIN} --debug"
/root/acme.sh/acme.sh --cert-home "${CERTHOME}" --issue --standalone -d ${DOMAIN} --debug /root/acme.sh/acme.sh --cert-home "${CERTHOME}" --issue --standalone -d "${DOMAIN}" --debug
((TRY++)) ((TRY++))
if [ "${TRY}" -ge 3 ]; then if [ "${TRY}" -ge 3 ]; then
echo "Requesting TLS cert for ${DOMAIN} failed. Check log please." echo "Requesting TLS cert for ${DOMAIN} failed. Check log please."

2
server-lgp.sh
View File

@@ -89,7 +89,7 @@ inbound=$(echo $inbound| jq -c '.streamSettings += {"security":"none"}')
# Fallback settings # Fallback settings
for fb in "${fallback[@]}" for fb in "${fallback[@]}"
do do
IFS=':'; fopt=(${fb}); fopt=(${fopt[@]}) IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}" fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
unset IFS unset IFS
if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi

2
server-lgr.sh
View File

@@ -126,7 +126,7 @@ inbound=$(echo $inbound| jq -c --argjson JshortIds "${JshortIds}" '.streamSettin
# Fallback settings # Fallback settings
for fb in "${fallback[@]}" for fb in "${fallback[@]}"
do do
IFS=':'; fopt=(${fb}); fopt=(${fopt[@]}) IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}" fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
unset IFS unset IFS
if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi

2
server-lgt.sh
View File

@@ -107,7 +107,7 @@ inbound=$(echo $inbound| jq -c --arg fullchain "${fullchain}" --arg prvkey "${pr
# Fallback settings # Fallback settings
for fb in "${fallback[@]}" for fb in "${fallback[@]}"
do do
IFS=':'; fopt=(${fb}); fopt=(${fopt[@]}) IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}" fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
unset IFS unset IFS
if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi

2
server-lsp.sh
View File

@@ -89,7 +89,7 @@ inbound=$(echo $inbound| jq -c '.streamSettings += {"security":"none"}')
# Fallback settings # Fallback settings
for fb in "${fallback[@]}" for fb in "${fallback[@]}"
do do
IFS=':'; fopt=(${fb}); fopt=(${fopt[@]}) IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}" fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
unset IFS unset IFS
if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi

2
server-lst.sh
View File

@@ -107,7 +107,7 @@ inbound=$(echo $inbound| jq -c --arg fullchain "${fullchain}" --arg prvkey "${pr
# Fallback settings # Fallback settings
for fb in "${fallback[@]}" for fb in "${fallback[@]}"
do do
IFS=':'; fopt=(${fb}); fopt=(${fopt[@]}) IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}" fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
unset IFS unset IFS
if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi

2
server-ltr.sh
View File

@@ -118,7 +118,7 @@ inbound=$(echo $inbound| jq -c --argjson JshortIds "${JshortIds}" '.streamSettin
# Fallback settings # Fallback settings
for fb in "${fallback[@]}" for fb in "${fallback[@]}"
do do
IFS=':'; fopt=(${fb}); fopt=(${fopt[@]}) IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}" fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
unset IFS unset IFS
if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi

2
server-ltt.sh
View File

@@ -99,7 +99,7 @@ inbound=$(echo $inbound| jq -c --arg fullchain "${fullchain}" --arg prvkey "${pr
# Fallback settings # Fallback settings
for fb in "${fallback[@]}" for fb in "${fallback[@]}"
do do
IFS=':'; fopt=(${fb}); fopt=(${fopt[@]}) IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}" fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
unset IFS unset IFS
if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi

2
server-lwp.sh
View File

@@ -89,7 +89,7 @@ inbound=$(echo $inbound| jq -c '.streamSettings += {"security":"none"}')
# Fallback settings # Fallback settings
for fb in "${fallback[@]}" for fb in "${fallback[@]}"
do do
IFS=':'; fopt=(${fb}); fopt=(${fopt[@]}) IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}" fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
unset IFS unset IFS
if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi

2
server-lwt.sh
View File

@@ -107,7 +107,7 @@ inbound=$(echo $inbound| jq -c --arg fullchain "${fullchain}" --arg prvkey "${pr
# Fallback settings # Fallback settings
for fb in "${fallback[@]}" for fb in "${fallback[@]}"
do do
IFS=':'; fopt=(${fb}); fopt=(${fopt[@]}) IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}" fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
unset IFS unset IFS
if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi

2
server-mtt.sh
View File

@@ -99,7 +99,7 @@ inbound=$(echo $inbound| jq -c --arg fullchain "${fullchain}" --arg prvkey "${pr
# Fallback settings # Fallback settings
for fb in "${fallback[@]}" for fb in "${fallback[@]}"
do do
IFS=':'; fopt=(${fb}); fopt=(${fopt[@]}) IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}" fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
unset IFS unset IFS
if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi

2
server-mwp.sh
View File

@@ -89,7 +89,7 @@ inbound=$(echo $inbound| jq -c '.streamSettings += {"security":"none"}')
# Fallback settings # Fallback settings
for fb in "${fallback[@]}" for fb in "${fallback[@]}"
do do
IFS=':'; fopt=(${fb}); fopt=(${fopt[@]}) IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}" fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
unset IFS unset IFS
if [ -z "${fport}" ]; then if [ -z "${fport}" ]; then

2
server-mwt.sh
View File

@@ -107,7 +107,7 @@ inbound=$(echo $inbound| jq -c --arg fullchain "${fullchain}" --arg prvkey "${pr
# Fallback settings # Fallback settings
for fb in "${fallback[@]}" for fb in "${fallback[@]}"
do do
IFS=':'; fopt=(${fb}); fopt=(${fopt[@]}) IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}" fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
unset IFS unset IFS
if [ -z "${fport}" ]; then if [ -z "${fport}" ]; then

26
server-nginx.sh
View File

@@ -114,18 +114,18 @@ if [ -n "${STSVR}" ]; then
done done
# Adding map.conf down to #XMAP_TAG tag # Adding map.conf down to #XMAP_TAG tag
sed -i '/#XMAP_TAG/r /tmp/stmap.conf' $NGCONF sed -i '/#XMAP_TAG/r /tmp/stmap.conf' "$NGCONF"
# Adding ups.conf down to #XUPSTREAM_TAG tag # Adding ups.conf down to #XUPSTREAM_TAG tag
sed -i '/#XUPSTREAM_TAG/r /tmp/stups.conf' $NGCONF sed -i '/#XUPSTREAM_TAG/r /tmp/stups.conf' "$NGCONF"
sed -i "s/STPORT/${STPORT}/g" $NGCONF sed -i "s/STPORT/${STPORT}/g" "$NGCONF"
# Adding "proxy_protocol=on" down to #STPROXY_PASS_TAG tag # Adding "proxy_protocol=on" down to #STPROXY_PASS_TAG tag
if [ -n "${STPROXY_PASS}" ]; then if [ -n "${STPROXY_PASS}" ]; then
echo " proxy_protocol on;" >/tmp/stproxy.conf echo " proxy_protocol on;" >/tmp/stproxy.conf
sed -i '/#STPROXY_PASS_TAG/r /tmp/stproxy.conf' $NGCONF sed -i '/#STPROXY_PASS_TAG/r /tmp/stproxy.conf' "$NGCONF"
fi fi
rm -rf /tmp/stmap.conf; rm -rf /tmp/stups.conf; rm -rf /tmp/stproxy.conf rm -rf /tmp/stmap.conf; rm -rf /tmp/stups.conf; rm -rf /tmp/stproxy.conf
echo "Generated $NGCONF ====>" echo "Generated $NGCONF ====>"
cat $NGCONF cat "$NGCONF"
fi fi
# Generating Nginx site server configurations. # Generating Nginx site server configurations.
@@ -194,7 +194,7 @@ do
sed -i 's/proxy_add_x_forwarded_for/proxy_protocol_addr/g' "${site_domain}.conf" sed -i 's/proxy_add_x_forwarded_for/proxy_protocol_addr/g' "${site_domain}.conf"
fi fi
echo "Generated /etc/nginx/conf.d/${site_domain}.conf ====>" echo "Generated /etc/nginx/conf.d/${site_domain}.conf ====>"
cat /etc/nginx/conf.d/${site_domain}.conf cat "/etc/nginx/conf.d/${site_domain}.conf"
done done
done done
@@ -239,19 +239,19 @@ do
# Add tpl file content down to #LOCATION tag # Add tpl file content down to #LOCATION tag
case "${xnetwork}" in case "${xnetwork}" in
ws|websocket) ws|websocket)
sed -i '/#XLOCATION_TAG/r nginx-ws.tpl' ${xdomain}.conf sed -i '/#XLOCATION_TAG/r nginx-ws.tpl' "${xdomain}.conf"
;; ;;
grpc) grpc)
sed -i '/#XLOCATION_TAG/r nginx-grpc.tpl' ${xdomain}.conf sed -i '/#XLOCATION_TAG/r nginx-grpc.tpl' "${xdomain}.conf"
;; ;;
splt|proxy) splt|proxy)
sed -i '/#XLOCATION_TAG/r nginx-proxy.tpl' ${xdomain}.conf sed -i '/#XLOCATION_TAG/r nginx-proxy.tpl' "${xdomain}.conf"
;; ;;
esac esac
ESC_LOCATION=$(printf '%s\n' "${xlocation}" | sed -e 's/[]\/$*.^[]/\\&/g') ESC_LOCATION=$(printf '%s\n' "${xlocation}" | sed -e 's/[]\/$*.^[]/\\&/g')
sed -i "s/HOST/${xhost}/g" ${xdomain}.conf sed -i "s/HOST/${xhost}/g" "${xdomain}.conf"
sed -i "s/PORT/${xport}/g" ${xdomain}.conf sed -i "s/PORT/${xport}/g" "${xdomain}.conf"
sed -i "s/WEBPATH/${ESC_LOCATION}/g" ${xdomain}.conf sed -i "s/WEBPATH/${ESC_LOCATION}/g" "${xdomain}.conf"
# Applying proxy log format instead of main format when --ng-server proxy_pass was set # Applying proxy log format instead of main format when --ng-server proxy_pass was set
if [ -n "${NGPROTOCOL}" ]; then if [ -n "${NGPROTOCOL}" ]; then
sed -i '/access_log/s/main/proxy/' "${xdomain}.conf" sed -i '/access_log/s/main/proxy/' "${xdomain}.conf"
@@ -259,7 +259,7 @@ do
sed -i 's/proxy_add_x_forwarded_for/proxy_protocol_addr/g' "${xdomain}.conf" sed -i 's/proxy_add_x_forwarded_for/proxy_protocol_addr/g' "${xdomain}.conf"
fi fi
echo "Generated /etc/nginx/conf.d/${xdomain}.conf ====>" echo "Generated /etc/nginx/conf.d/${xdomain}.conf ====>"
cat /etc/nginx/conf.d/${xdomain}.conf cat "/etc/nginx/conf.d/${xdomain}.conf"
done done
done done
exit 0 exit 0

2
server-ttt.sh
View File

@@ -99,7 +99,7 @@ inbound=$(echo $inbound| jq -c --arg fullchain "${fullchain}" --arg prvkey "${pr
# Fallback settings # Fallback settings
for fb in "${fallback[@]}" for fb in "${fallback[@]}"
do do
IFS=':'; fopt=(${fb}); fopt=(${fopt[@]}) IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}" fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
unset IFS unset IFS
if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi if [ -z "${fport}" ]; then >&2 echo -e "Incorrect fallback format: $fb\n"; usage; exit 1; fi

2
server-twp.sh
View File

@@ -89,7 +89,7 @@ inbound=$(echo $inbound| jq -c '.streamSettings += {"security":"none"}')
# Fallback settings # Fallback settings
for fb in "${fallback[@]}" for fb in "${fallback[@]}"
do do
IFS=':'; fopt=(${fb}); fopt=(${fopt[@]}) IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}" fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
unset IFS unset IFS
if [ -z "${fport}" ]; then if [ -z "${fport}" ]; then

2
server-twt.sh
View File

@@ -107,7 +107,7 @@ inbound=$(echo $inbound| jq -c --arg fullchain "${fullchain}" --arg prvkey "${pr
# Fallback settings # Fallback settings
for fb in "${fallback[@]}" for fb in "${fallback[@]}"
do do
IFS=':'; fopt=(${fb}); fopt=(${fopt[@]}) IFS=':'; fopt=("${fb}"); fopt=("${fopt[@]}")
fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}" fhost="${fopt[0]}"; fport="${fopt[1]}"; fpath="${fopt[2]}"
unset IFS unset IFS
if [ -z "${fport}" ]; then if [ -z "${fport}" ]; then