diff --git a/server-lpg.sh b/server-lpg.sh index cf097a7..44f7a15 100755 --- a/server-lpg.sh +++ b/server-lpg.sh @@ -4,6 +4,8 @@ usage() { echo "Usage: server-lpg ,,," } +port=443 + options=(`echo $1 |tr ',' ' '`) for option in "${options[@]}" do @@ -30,8 +32,10 @@ if [ -z "${xconf}" ]; then exit 1 fi -if [ -z "${port}" ]; then - port=443 +if [ -z "${service}" ]; then + echo "Error: service name undefined." + usage + exit 1 fi if [ -z "${xuser}" ]; then @@ -74,6 +78,10 @@ cat $XCONF |jq --arg port "${port}" \ '( .inbounds[] | select(.port == ($port|tonumber)) | .settings.decryption ) += "none" ' \ |sponge $XCONF -cat $XCONF |jq --arg port "${port}" --arg service "${service}" \ -'( .inbounds[] | select(.port == ($port|tonumber)) | .streamSettings ) += {"network":"grpc", "grpcSettings":{"serviceName":$service}, "security":"none"} ' \ +cat $XCONF |jq --arg port "${port}" \ +'( .inbounds[] | select(.port == ($port|tonumber)) | .streamSettings ) += {"network":"grpc", "security":"none" } ' \ +|sponge $XCONF + +cat $XCONF |jq --arg port "${port}" --arg service "${service}" \ +'( .inbounds[] | select(.port == ($port|tonumber)) | .streamSettings ) += {"grpcSettings":{"serviceName":$service}} ' \ |sponge $XCONF diff --git a/server-lps.sh b/server-lps.sh index 5503489..7895d98 100755 --- a/server-lps.sh +++ b/server-lps.sh @@ -4,6 +4,8 @@ usage() { echo "Usage: server-lps ,,," } +port=443 + options=(`echo $1 |tr ',' ' '`) for option in "${options[@]}" do @@ -33,10 +35,6 @@ if [ -z "${xconf}" ]; then exit 1 fi -if [ -z "${port}" ]; then - port=443 -fi - if [ -z "${xuser}" ]; then echo "Error: user undefined." usage diff --git a/server-lpw.sh b/server-lpw.sh index 579298e..f3d9b7d 100755 --- a/server-lpw.sh +++ b/server-lpw.sh @@ -4,6 +4,8 @@ usage() { echo "Usage: server-lpw ,,," } +port=443 + options=(`echo $1 |tr ',' ' '`) for option in "${options[@]}" do @@ -33,10 +35,6 @@ if [ -z "${xconf}" ]; then exit 1 fi -if [ -z "${port}" ]; then - port=443 -fi - if [ -z "${xuser}" ]; then echo "Error: user undefined." usage diff --git a/server-mpw.sh b/server-mpw.sh index fbcc818..d654b00 100755 --- a/server-mpw.sh +++ b/server-mpw.sh @@ -4,6 +4,8 @@ usage() { echo "Usage: server-mpw ,,," } +port=443 + options=(`echo $1 |tr ',' ' '`) for option in "${options[@]}" do @@ -33,10 +35,6 @@ if [ -z "${xconf}" ]; then exit 1 fi -if [ -z "${port}" ]; then - port=443 -fi - if [ -z "${xuser}" ]; then echo "Error: user undefined." usage diff --git a/server-tpw.sh b/server-tpw.sh index 03fc0aa..eeced06 100755 --- a/server-tpw.sh +++ b/server-tpw.sh @@ -4,6 +4,8 @@ usage() { echo "Usage: server-tpw ,," } +port=443 + options=(`echo $1 |tr ',' ' '`) for option in "${options[@]}" do @@ -33,10 +35,6 @@ if [ -z "${xconf}" ]; then exit 1 fi -if [ -z "${port}" ]; then - port=443 -fi - if [ -z "${xuser}" ]; then echo "Error: user undefined." usage @@ -126,10 +124,6 @@ cat $XCONF |jq --arg port "${port}" \ '( .inbounds[] | select(.port == ($port|tonumber)) | .streamSettings ) += {"network":"ws", "security":"none" } ' \ |sponge $XCONF -cat $XCONF |jq --arg port "${port}" \ -'( .inbounds[] | select(.port == ($port|tonumber)) | .streamSettings ) += {"tlsSettings":{"alpn":["http/1.1"]} } ' \ -|sponge $XCONF - cat $XCONF |jq --arg port "${port}" --arg wspath "${wspath}" \ '( .inbounds[] | select(.port == ($port|tonumber)) | .streamSettings ) += {"wsSettings":{"path":$wspath}} ' \ |sponge $XCONF diff --git a/server-tsw.sh b/server-tsw.sh index 64782fb..90ed540 100755 --- a/server-tsw.sh +++ b/server-tsw.sh @@ -145,7 +145,7 @@ cat $XCONF |jq --arg port "${port}" \ |sponge $XCONF cat $XCONF |jq --arg port "${port}" \ -'( .inbounds[] | select(.port == ($port|tonumber)) | .streamSettings ) += {"tlsSettings":{"alpn":["http/1.1"]} } ' \ +'( .inbounds[] | select(.port == ($port|tonumber)) | .streamSettings ) += {"tlsSettings":{"alpn":["h2,http/1.1"]} } ' \ |sponge $XCONF cat $XCONF |jq --arg port "${port}" --arg wspath "${wspath}" \ diff --git a/site-ssl.conf.tpl b/site-ssl.conf.tpl index cc93db1..da0a64e 100644 --- a/site-ssl.conf.tpl +++ b/site-ssl.conf.tpl @@ -8,7 +8,9 @@ server { ssl_certificate_key PRVKEYFILE; ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers HIGH:!aNULL:!MD5; - add_header Alt-Svc 'h3=":443"; ma=86400'; + add_header Alt-Svc 'h3=":443"; ma=86400'; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; client_header_timeout 1071906480m; keepalive_timeout 1071906480m;