Merge branch 'dev'

pull/534/merge
mack-a 2020-12-21 14:09:28 +08:00
commit 0648f73679
1 changed files with 6 additions and 2 deletions

View File

@ -493,8 +493,11 @@ cat << EOF > /etc/nginx/conf.d/alone.conf
listen 31300; listen 31300;
server_name ${domain}; server_name ${domain};
root /usr/share/nginx/html; root /usr/share/nginx/html;
# location ~ /.well-known {allow all;} location / {
# location /test {return 200 'fjkvymb6len';} add_header Strict-Transport-Security "max-age=63072000" always;
}
# location ~ /.well-known {allow all;}
# location /test {return 200 'fjkvymb6len';}
} }
EOF EOF
} }
@ -2013,6 +2016,7 @@ EOF
"network": "tcp", "network": "tcp",
"security": "xtls", "security": "xtls",
"xtlsSettings": { "xtlsSettings": {
"minVersion": "1.2",
"alpn": [ "alpn": [
"http/1.1" "http/1.1"
], ],