diff --git a/README.md b/README.md index aef4d4d..6c730b5 100644 --- a/README.md +++ b/README.md @@ -29,12 +29,6 @@ Please replace "amd64" with the arch match the current box accordingly. Other su ```shell $ docker run --rm samuelhbne/server-xray -server-xray -- [-r|--request-domain ] [-c|--cert-path ] [-k|--hook ] - -k|--hook [Optional] DDNS update or notifing URL to be hit. Multiple allowed - -r|--request-domain [Optional] Domain name to request for letsencrypt cert. Multiple allowed - -c|--cert-path [Optional] Reading TLS certs from folder //. Multiple allowed - -i|--stdin [Optional] Read config from stdin instead of auto generation - -d|--debug [Optional] Start in debug mode with verbose output --ltx [p=443,]d=domain.com,u=id[:level[:email]][,f=[fb-host]:fb-port:[fb-path]] --ltt [p=443,]d=domain.com,u=id[:level[:email]][,f=[fb-host]:fb-port:[fb-path]] --lttw [p=443,]d=domain.com,u=id[:level[:email]][,f=[fb-host]:fb-port:[fb-path]],w=/webpath @@ -43,6 +37,11 @@ server-xray -- [-r|--request-domain [p=443,]d=domain.com,u=id[:level[:email]][,f=[fb-host]:fb-port:[fb-path]],w=/webpath --ttt [p=443,]d=domain.com,u=psw[:level[:email]][,f=[fb-host]:fb-port:[fb-path]] --tttw [p=443,]d=domain.com,u=psw[:level[:email]][,f=[fb-host]:fb-port:[fb-path]],w=/webpath + -k|--hook [Optional] DDNS update or notifing URL to be hit + -r|--request-domain [Optional] Domain name to request for letsencrypt cert + -c|--cert-path [Optional] Reading TLS certs from folder // + -i|--stdin [Optional] Read config from stdin instead of auto generation + -d|--debug [Optional] Start in debug mode with verbose output $ docker run --name server-xray -p 80:80 -p 443:2443 -d samuelhbne/server-xray \ --ltx p=2443,d=mydomain.duckdns.org,u=myid,f=:8080 \ diff --git a/run.sh b/run.sh index 88d17ab..0cd9a00 100755 --- a/run.sh +++ b/run.sh @@ -5,12 +5,7 @@ DIR="$(cd $DIR; pwd)" XCONF=/tmp/server-xray.json usage() { - echo "server-xray -- [-r|--request-domain ] [-c|--cert-path ] [-k|--hook ]" - echo " -k|--hook [Optional] DDNS update or notifing URL to be hit. Multiple allowed" - echo " -r|--request-domain [Optional] Domain name to request for letsencrypt cert. Multiple allowed" - echo " -c|--cert-path [Optional] Reading TLS certs from folder //. Multiple allowed" - echo " -i|--stdin [Optional] Read config from stdin instead of auto generation" - echo " -d|--debug [Optional] Start in debug mode with verbose output" + echo "server-xray " echo " --ltx [p=443,]d=domain.com,u=id[:level[:email]][,f=[fb-host]:fb-port:[fb-path]]" echo " --ltt [p=443,]d=domain.com,u=id[:level[:email]][,f=[fb-host]:fb-port:[fb-path]]" echo " --lttw [p=443,]d=domain.com,u=id[:level[:email]][,f=[fb-host]:fb-port:[fb-path]],w=/webpath" @@ -21,6 +16,11 @@ usage() { echo " --tttw [p=443,]d=domain.com,u=psw[:level[:email]][,f=[fb-host]:fb-port:[fb-path]],w=/webpath" # echo " --ssa [port=443,]user=password1:method1[,user=password2:method2]" # echo " --sst [port=443,]user=passwd,method=xxxx" + echo " -k|--hook [Optional] DDNS update or notifing URL to be hit" + echo " -r|--request-domain [Optional] Domain name to request for letsencrypt cert" + echo " -c|--cert-path [Optional] Reading TLS certs from folder //" + echo " -i|--stdin [Optional] Read config from stdin instead of auto generation" + 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:,mtt:,mttw:,ttt:,tttw:,lttg:,ssa:,sst:stdin,debug -n "$0" -- $@`