diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index db9eee8..0fd6bd1 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -27,7 +27,7 @@ ADD server-mtt.sh /server-mtt.sh ADD server-mttw.sh /server-mttw.sh ADD server-ttt.sh /server-ttt.sh ADD server-tttw.sh /server-tttw.sh -ADD server-gttn.sh /server-gttn.sh +ADD server-lttg.sh /server-lttg.sh RUN chmod 755 /*.sh diff --git a/Dockerfile.arm b/Dockerfile.arm index b9be6e5..06f86bc 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -27,7 +27,7 @@ ADD server-mtt.sh /server-mtt.sh ADD server-mttw.sh /server-mttw.sh ADD server-ttt.sh /server-ttt.sh ADD server-tttw.sh /server-tttw.sh -ADD server-gttn.sh /server-gttn.sh +ADD server-lttg.sh /server-lttg.sh RUN chmod 755 /*.sh diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 6257aab..24295f7 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -27,7 +27,7 @@ ADD server-mtt.sh /server-mtt.sh ADD server-mttw.sh /server-mttw.sh ADD server-ttt.sh /server-ttt.sh ADD server-tttw.sh /server-tttw.sh -ADD server-gttn.sh /server-gttn.sh +ADD server-lttg.sh /server-lttg.sh RUN chmod 755 /*.sh diff --git a/run.sh b/run.sh index 6a7df4a..f4def1c 100755 --- a/run.sh +++ b/run.sh @@ -12,17 +12,17 @@ usage() { echo " --ltx p=443,d=domain0.com,u=uuid[:level[:email]][,f=[fallback-host]:fb-port:[fb-path]]" echo " --ltt p=1443,d=domain1.com,u=uuid[:level[:email]][,f=[fallback-host]:fb-port:[fb-path]]" echo " --lttw p=2443,d=domain2.com,u=uuid[:level[:email]][,f=[fallback-host]:fb-port:[fb-path]],w=/webpath" + echo " --lttg p=7443,d=domain0.com,u=uuid[:level[:email]],s=svcname,g=grpcport" echo " --mtt p=3443,d=domain3.com,u=uuid[:level[:email]][,f=[fallback-host]:fb-port:[fb-path]]" echo " --mttw p=4443,d=domain4.com,u=uuid[:level[:email]][,f=[fallback-host]:fb-port:[fb-path]],w=/webpath" echo " --ttt p=5443,d=domain5.com,u=passwd[:email][,f=[fallback-host]:fb-port:[fb-path]]" echo " --tttw p=6443,d=domain5.com,u=passwd[:email][,f=[fallback-host]:fb-port:[fb-path]],w=/webpath" - echo " --gttn p=7443,d=domain0.com,u=uuid[:level[:email]],s=svcname,g=grpcport" # echo " --ssa port=8443,user=password1:method1[,user=password2:method2]" # echo " --sst port=9443,user=passwd,method=xxxx" echo " --stdin Read XRay config from stdin instead of auto generation" } -TEMP=`getopt -o k:r:c:d --long hook:,request-domain:,cert-path:,ltx:,ltt:,lttw:,mtt:,mttw:,ttt:,tttw:,gttn:,ssa:,sst:stdin,debug -n "$0" -- $@` +TEMP=`getopt -o k:r:c:d --long hook:,request-domain:,cert-path:,ltx:,ltt:,lttw:,mtt:,mttw:,ttt:,tttw:,lttg:,ssa:,sst:stdin,debug -n "$0" -- $@` if [ $? != 0 ] ; then usage; exit 1 ; fi eval set -- "$TEMP" @@ -44,10 +44,10 @@ while true ; do DEBUG=1 shift 1 ;; - --ltx|--ltt|--lttw|--mtt|--mttw|--ttt|--tttw|--gttn) - if [ "$1" = "--gttn" ]; then NGINX=1; fi + --ltx|--ltt|--lttw|--lttg|--mtt|--mttw|--ttt|--tttw) + if [ "$1" = "--lttg" ]; then NGINX=1; fi SVC=`echo $1|tr -d '\-\-'` - SVCMD+=("$DIR/server-${SVC}.sh $2") + SVCMD+=("${DIR}server-${SVC}.sh $2") shift 2 ;; --stdin) diff --git a/server-gttn.sh b/server-lttg.sh similarity index 100% rename from server-gttn.sh rename to server-lttg.sh