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

Remove default email to avoid id conflict

Browse Source
This commit is contained in:
Samuel Huang
2021-09-23 21:05:06 +10:00
parent feb470c89f
commit fefe20394d
13 changed files with 28 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
run.sh
View File

@@ -22,6 +22,7 @@ usage() {
# echo " --sst <Shadowsocks-TCP option> [port=443,]user=passwd,method=xxxx" # echo " --sst <Shadowsocks-TCP option> [port=443,]user=passwd,method=xxxx"
echo " --ng-opt <nginx-options> [p=443,]d=domain0.com[,d=domain1.com]" echo " --ng-opt <nginx-options> [p=443,]d=domain0.com[,d=domain1.com]"
echo " --ng-proxy <nginx-proxy-options> [d=domain0.com,][d=domain1.com][h=127.0.0.1,]p=port-backend,l=location,n=ws|grpc" echo " --ng-proxy <nginx-proxy-options> [d=domain0.com,][d=domain1.com][h=127.0.0.1,]p=port-backend,l=location,n=ws|grpc"
echo " -u|--user <global-user-options> u=id0[:level[:email]][,u=id1...]"
echo " -k|--hook <hook-url> [Optional] DDNS update or notifing URL to be hit" echo " -k|--hook <hook-url> [Optional] DDNS update or notifing URL to be hit"
echo " -r|--request-domain <domain-name> [Optional] Domain name to request for letsencrypt cert" echo " -r|--request-domain <domain-name> [Optional] Domain name to request for letsencrypt cert"
echo " -c|--cert-path <cert-path-root> [Optional] Reading TLS certs from folder <cert-path-root>/<domain-name>/" echo " -c|--cert-path <cert-path-root> [Optional] Reading TLS certs from folder <cert-path-root>/<domain-name>/"
@@ -29,7 +30,7 @@ usage() {
echo " -d|--debug [Optional] Start in debug mode with verbose output" echo " -d|--debug [Optional] Start in debug mode with verbose output"
} }
TEMP=`getopt -o k:r:c:di --long hook:,request-domain:,cert-path:,ltx:,ltt:,lttw:,ltpw:,mtt:,mttw:,mtpw:,ttt:,tttw:,ttpw:,lttg:,ltpg:,ssa:,sst:,ng-opt:,ng-proxy:,stdin,debug -n "$0" -- $@` TEMP=`getopt -o u:k:r:c:di --long user:,hook:,request-domain:,cert-path:,ltx:,ltt:,lttw:,ltpw:,mtt:,mttw:,mtpw:,ttt:,tttw:,ttpw:,lttg:,ltpg:,ssa:,sst:,ng-opt:,ng-proxy:,stdin,debug -n "$0" -- $@`
if [ $? != 0 ] ; then usage; exit 1 ; fi if [ $? != 0 ] ; then usage; exit 1 ; fi
eval set -- "$TEMP" eval set -- "$TEMP"
@@ -55,6 +56,10 @@ while true ; do
DEBUG=1 DEBUG=1
shift 1 shift 1
;; ;;
-u|--user)
UOPT+=("$2")
shift 2
;;
--ltx|--ltt|--lttw|--ltpw|--lttg|--ltpg|--mtt|--mttw|--mtpw|--ttt|--tttw|--ttpw) --ltx|--ltt|--lttw|--ltpw|--lttg|--ltpg|--mtt|--mttw|--mtpw|--ttt|--tttw|--ttpw)
SVC=`echo $1|tr -d '\-\-'` SVC=`echo $1|tr -d '\-\-'`
SVCMD+=("${DIR}server-${SVC}.sh $2") SVCMD+=("${DIR}server-${SVC}.sh $2")
@@ -118,6 +123,10 @@ for cp in "${CERTPATH[@]}"
do do
xopt="$xopt,certpath=$cp" xopt="$xopt,certpath=$cp"
done done
for uopt in "${UOPT[@]}"
do
xopt="$xopt,$uopt"
done
if [ -n "${SVCMD}" ]; then if [ -n "${SVCMD}" ]; then
for svcmd in "${SVCMD[@]}" for svcmd in "${SVCMD[@]}"

7
server-ltpg.sh
View File

@@ -56,8 +56,8 @@ do
if [ -z "${uopt[0]}" ]; then if [ -z "${uopt[0]}" ]; then
echo "Incorrect user format: ${xu}" echo "Incorrect user format: ${xu}"
echo "Correct user format: user=<uid>[:level:email]" echo "Correct user format: user=<uid>[:level:email]"
echo "Like: user=myid:0:nobody@g.cn" echo "Like: user=myid:0:me@g.cn"
echo "Like: user=myid::nobody@g.cn" echo "Like: user=myid::me@g.cn"
echo "Like: user=myid:0" echo "Like: user=myid:0"
echo "Like: user=myid" echo "Like: user=myid"
exit 1 exit 1
@@ -65,9 +65,6 @@ do
if [ -z "${uopt[1]}" ]; then if [ -z "${uopt[1]}" ]; then
uopt[1]=0 uopt[1]=0
fi fi
if [ -z "${uopt[2]}" ]; then
uopt[2]="nobody@g.cn"
fi
cat $XCONF |jq --arg port "${port}" --arg uid "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \ cat $XCONF |jq --arg port "${port}" --arg uid "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \
'( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"id":$uid, "level":($level|tonumber), "email":$email} ] ' \ '( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"id":$uid, "level":($level|tonumber), "email":$email} ] ' \
|sponge $XCONF |sponge $XCONF

7
server-ltpw.sh
View File

@@ -65,8 +65,8 @@ do
if [ -z "${uopt[0]}" ]; then if [ -z "${uopt[0]}" ]; then
echo "Incorrect user format: ${xu}" echo "Incorrect user format: ${xu}"
echo "Correct user format: user=<uid>[:level:email]" echo "Correct user format: user=<uid>[:level:email]"
echo "Like: user=myid:0:nobody@g.cn" echo "Like: user=myid:0:me@g.cn"
echo "Like: user=myid::nobody@g.cn" echo "Like: user=myid::me@g.cn"
echo "Like: user=myid:0" echo "Like: user=myid:0"
echo "Like: user=myid" echo "Like: user=myid"
exit 1 exit 1
@@ -74,9 +74,6 @@ do
if [ -z "${uopt[1]}" ]; then if [ -z "${uopt[1]}" ]; then
uopt[1]=0 uopt[1]=0
fi fi
if [ -z "${uopt[2]}" ]; then
uopt[2]="nobody@g.cn"
fi
cat $XCONF |jq --arg port "${port}" --arg uid "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \ cat $XCONF |jq --arg port "${port}" --arg uid "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \
'( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"id":$uid, "level":($level|tonumber), "email":$email} ] ' \ '( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"id":$uid, "level":($level|tonumber), "email":$email} ] ' \
|sponge $XCONF |sponge $XCONF

7
server-ltt.sh
View File

@@ -74,8 +74,8 @@ do
if [ -z "${uopt[0]}" ]; then if [ -z "${uopt[0]}" ]; then
echo "Incorrect user format: ${xu}" echo "Incorrect user format: ${xu}"
echo "Correct user format: user=<uid>[:level:email]" echo "Correct user format: user=<uid>[:level:email]"
echo "Like: user=myid:0:nobody@g.cn" echo "Like: user=myid:0:me@g.cn"
echo "Like: user=myid::nobody@g.cn" echo "Like: user=myid::me@g.cn"
echo "Like: user=myid:0" echo "Like: user=myid:0"
echo "Like: user=myid" echo "Like: user=myid"
exit 1 exit 1
@@ -83,9 +83,6 @@ do
if [ -z "${uopt[1]}" ]; then if [ -z "${uopt[1]}" ]; then
uopt[1]=0 uopt[1]=0
fi fi
if [ -z "${uopt[2]}" ]; then
uopt[2]="nobody@g.cn"
fi
cat $XCONF |jq --arg port "${port}" --arg uid "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \ cat $XCONF |jq --arg port "${port}" --arg uid "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \
'( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"id":$uid, "level":($level|tonumber), "email":$email} ] ' \ '( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"id":$uid, "level":($level|tonumber), "email":$email} ] ' \
|sponge $XCONF |sponge $XCONF

7
server-lttg.sh
View File

@@ -74,8 +74,8 @@ do
if [ -z "${uopt[0]}" ]; then if [ -z "${uopt[0]}" ]; then
echo "Incorrect user format: ${xu}" echo "Incorrect user format: ${xu}"
echo "Correct user format: user=<uid>[:level:email]" echo "Correct user format: user=<uid>[:level:email]"
echo "Like: user=myid:0:nobody@g.cn" echo "Like: user=myid:0:me@g.cn"
echo "Like: user=myid::nobody@g.cn" echo "Like: user=myid::me@g.cn"
echo "Like: user=myid:0" echo "Like: user=myid:0"
echo "Like: user=myid" echo "Like: user=myid"
exit 1 exit 1
@@ -83,9 +83,6 @@ do
if [ -z "${uopt[1]}" ]; then if [ -z "${uopt[1]}" ]; then
uopt[1]=0 uopt[1]=0
fi fi
if [ -z "${uopt[2]}" ]; then
uopt[2]="nobody@g.cn"
fi
cat $XCONF |jq --arg port "${port}" --arg uid "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \ cat $XCONF |jq --arg port "${port}" --arg uid "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \
'( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"id":$uid, "level":($level|tonumber), "email":$email} ] ' \ '( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"id":$uid, "level":($level|tonumber), "email":$email} ] ' \
|sponge $XCONF |sponge $XCONF

7
server-lttw.sh
View File

@@ -83,8 +83,8 @@ do
if [ -z "${uopt[0]}" ]; then if [ -z "${uopt[0]}" ]; then
echo "Incorrect user format: ${xu}" echo "Incorrect user format: ${xu}"
echo "Correct user format: user=<uid>[:level:email]" echo "Correct user format: user=<uid>[:level:email]"
echo "Like: user=myid:0:nobody@g.cn" echo "Like: user=myid:0:me@g.cn"
echo "Like: user=myid::nobody@g.cn" echo "Like: user=myid::me@g.cn"
echo "Like: user=myid:0" echo "Like: user=myid:0"
echo "Like: user=myid" echo "Like: user=myid"
exit 1 exit 1
@@ -92,9 +92,6 @@ do
if [ -z "${uopt[1]}" ]; then if [ -z "${uopt[1]}" ]; then
uopt[1]=0 uopt[1]=0
fi fi
if [ -z "${uopt[2]}" ]; then
uopt[2]="nobody@g.cn"
fi
cat $XCONF |jq --arg port "${port}" --arg uid "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \ cat $XCONF |jq --arg port "${port}" --arg uid "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \
'( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"id":$uid, "level":($level|tonumber), "email":$email} ] ' \ '( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"id":$uid, "level":($level|tonumber), "email":$email} ] ' \
|sponge $XCONF |sponge $XCONF

7
server-ltx.sh
View File

@@ -74,8 +74,8 @@ do
if [ -z "${uopt[0]}" ]; then if [ -z "${uopt[0]}" ]; then
echo "Incorrect user format: ${xu}" echo "Incorrect user format: ${xu}"
echo "Correct user format: user=<uid>[:level:email]" echo "Correct user format: user=<uid>[:level:email]"
echo "Like: user=myid:0:nobody@g.cn" echo "Like: user=myid:0:me@g.cn"
echo "Like: user=myid::nobody@g.cn" echo "Like: user=myid::me@g.cn"
echo "Like: user=myid:0" echo "Like: user=myid:0"
echo "Like: user=myid" echo "Like: user=myid"
exit 1 exit 1
@@ -83,9 +83,6 @@ do
if [ -z "${uopt[1]}" ]; then if [ -z "${uopt[1]}" ]; then
uopt[1]=0 uopt[1]=0
fi fi
if [ -z "${uopt[2]}" ]; then
uopt[2]="nobody@g.cn"
fi
cat $XCONF |jq --arg port "${port}" --arg uid "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \ cat $XCONF |jq --arg port "${port}" --arg uid "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \
'( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"id":$uid, "flow":"xtls-rprx-direct", "level":($level|tonumber), "email":$email} ] ' \ '( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"id":$uid, "flow":"xtls-rprx-direct", "level":($level|tonumber), "email":$email} ] ' \
|sponge $XCONF |sponge $XCONF

7
server-mtpw.sh
View File

@@ -65,8 +65,8 @@ do
if [ -z "${uopt[0]}" ]; then if [ -z "${uopt[0]}" ]; then
echo "Incorrect user format: ${xu}" echo "Incorrect user format: ${xu}"
echo "Correct user format: user=<uid>[:level:email]" echo "Correct user format: user=<uid>[:level:email]"
echo "Like: user=myid:0:nobody@g.cn" echo "Like: user=myid:0:me@g.cn"
echo "Like: user=myid::nobody@g.cn" echo "Like: user=myid::me@g.cn"
echo "Like: user=myid:0" echo "Like: user=myid:0"
echo "Like: user=myid" echo "Like: user=myid"
exit 1 exit 1
@@ -74,9 +74,6 @@ do
if [ -z "${uopt[1]}" ]; then if [ -z "${uopt[1]}" ]; then
uopt[1]=0 uopt[1]=0
fi fi
if [ -z "${uopt[2]}" ]; then
uopt[2]="nobody@g.cn"
fi
cat $XCONF |jq --arg port "${port}" --arg uid "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \ cat $XCONF |jq --arg port "${port}" --arg uid "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \
'( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"id":$uid, "level":($level|tonumber), "email":$email} ] ' \ '( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"id":$uid, "level":($level|tonumber), "email":$email} ] ' \
|sponge $XCONF |sponge $XCONF

7
server-mtt.sh
View File

@@ -74,8 +74,8 @@ do
if [ -z "${uopt[0]}" ]; then if [ -z "${uopt[0]}" ]; then
echo "Incorrect user format: ${xu}" echo "Incorrect user format: ${xu}"
echo "Correct user format: user=<uid>[:level:email]" echo "Correct user format: user=<uid>[:level:email]"
echo "Like: user=myid:0:nobody@g.cn" echo "Like: user=myid:0:me@g.cn"
echo "Like: user=myid::nobody@g.cn" echo "Like: user=myid::me@g.cn"
echo "Like: user=myid:0" echo "Like: user=myid:0"
echo "Like: user=myid" echo "Like: user=myid"
exit 1 exit 1
@@ -83,9 +83,6 @@ do
if [ -z "${uopt[1]}" ]; then if [ -z "${uopt[1]}" ]; then
uopt[1]=0 uopt[1]=0
fi fi
if [ -z "${uopt[2]}" ]; then
uopt[2]="nobody@g.cn"
fi
cat $XCONF |jq --arg port "${port}" --arg uid "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \ cat $XCONF |jq --arg port "${port}" --arg uid "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \
'( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"id":$uid, "level":($level|tonumber), "email":$email} ] ' \ '( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"id":$uid, "level":($level|tonumber), "email":$email} ] ' \
|sponge $XCONF |sponge $XCONF

7
server-mttw.sh
View File

@@ -83,8 +83,8 @@ do
if [ -z "${uopt[0]}" ]; then if [ -z "${uopt[0]}" ]; then
echo "Incorrect user format: ${xu}" echo "Incorrect user format: ${xu}"
echo "Correct user format: user=<uid>[:level:email]" echo "Correct user format: user=<uid>[:level:email]"
echo "Like: user=myid:0:nobody@g.cn" echo "Like: user=myid:0:me@g.cn"
echo "Like: user=myid::nobody@g.cn" echo "Like: user=myid::me@g.cn"
echo "Like: user=myid:0" echo "Like: user=myid:0"
echo "Like: user=myid" echo "Like: user=myid"
exit 1 exit 1
@@ -92,9 +92,6 @@ do
if [ -z "${uopt[1]}" ]; then if [ -z "${uopt[1]}" ]; then
uopt[1]=0 uopt[1]=0
fi fi
if [ -z "${uopt[2]}" ]; then
uopt[2]="nobody@g.cn"
fi
cat $XCONF |jq --arg port "${port}" --arg uid "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \ cat $XCONF |jq --arg port "${port}" --arg uid "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \
'( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"id":$uid, "level":($level|tonumber), "email":$email} ] ' \ '( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"id":$uid, "level":($level|tonumber), "email":$email} ] ' \
|sponge $XCONF |sponge $XCONF

3
server-ttpw.sh
View File

@@ -74,9 +74,6 @@ do
if [ -z "${uopt[1]}" ]; then if [ -z "${uopt[1]}" ]; then
uopt[1]=0 uopt[1]=0
fi fi
if [ -z "${uopt[2]}" ]; then
uopt[2]="nobody@g.cn"
fi
cat $XCONF |jq --arg port "${port}" --arg pass "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \ cat $XCONF |jq --arg port "${port}" --arg pass "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \
'( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"password":$pass, "level":($level|tonumber), "email":$email} ] ' \ '( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"password":$pass, "level":($level|tonumber), "email":$email} ] ' \
|sponge $XCONF |sponge $XCONF

3
server-ttt.sh
View File

@@ -83,9 +83,6 @@ do
if [ -z "${uopt[1]}" ]; then if [ -z "${uopt[1]}" ]; then
uopt[1]=0 uopt[1]=0
fi fi
if [ -z "${uopt[2]}" ]; then
uopt[2]="nobody@g.cn"
fi
cat $XCONF |jq --arg port "${port}" --arg pass "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \ cat $XCONF |jq --arg port "${port}" --arg pass "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \
'( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"password":$pass, "level":($level|tonumber), "email":$email} ] ' \ '( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"password":$pass, "level":($level|tonumber), "email":$email} ] ' \
|sponge $XCONF |sponge $XCONF

3
server-tttw.sh
View File

@@ -92,9 +92,6 @@ do
if [ -z "${uopt[1]}" ]; then if [ -z "${uopt[1]}" ]; then
uopt[1]=0 uopt[1]=0
fi fi
if [ -z "${uopt[2]}" ]; then
uopt[2]="nobody@g.cn"
fi
cat $XCONF |jq --arg port "${port}" --arg pass "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \ cat $XCONF |jq --arg port "${port}" --arg pass "${uopt[0]}" --arg level "${uopt[1]}" --arg email "${uopt[2]}" \
'( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"password":$pass, "level":($level|tonumber), "email":$email} ] ' \ '( .inbounds[] | select(.port == ($port|tonumber)) | .settings.clients ) += [ {"password":$pass, "level":($level|tonumber), "email":$email} ] ' \
|sponge $XCONF |sponge $XCONF