Merge branch 'dev-test' into dev-deploy

Author: ArgoZhang

BootstrapBlazor.sln

@@ -15,7 +15,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "linux", "linux", "{EA765165
 	ProjectSection(SolutionItems) = preProject
 		scripts\linux\ba.blazor.service = scripts\linux\ba.blazor.service
 		scripts\linux\deploy-blazor.sh = scripts\linux\deploy-blazor.sh
+		scripts\linux\deploy.sh = scripts\linux\deploy.sh
 		scripts\linux\nginx.conf = scripts\linux\nginx.conf
+		scripts\linux\remove.sh = scripts\linux\remove.sh
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "windows", "windows", "{4A5226E2-8EBD-4DEA-A1F5-2DF374655FA9}"
@@ -66,6 +68,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{02EA681E-C
 		README.zh-CN.md = README.zh-CN.md
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cert", "cert", "{C075C6C8-B9CB-4AC0-9BDF-B2002B4AB99C}"
+	ProjectSection(SolutionItems) = preProject
+		scripts\linux\cert\blazor.zone.cer = scripts\linux\cert\blazor.zone.cer
+		scripts\linux\cert\blazor.zone.key = scripts\linux\cert\blazor.zone.key
+		scripts\linux\cert\www.blazor.zone.cer = scripts\linux\cert\www.blazor.zone.cer
+		scripts\linux\cert\www.blazor.zone.key = scripts\linux\cert\www.blazor.zone.key
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -115,6 +125,7 @@ Global
 		{6D73FED6-0086-460B-84FA-1FA78176BF59} = {7C1D79F1-87BC-42C1-BD5A-CDE4044AC1BD}
 		{D8AEAFE7-10AF-4A5B-BC67-FE740A2CA1DF} = {7C1D79F1-87BC-42C1-BD5A-CDE4044AC1BD}
 		{01DA4687-0973-4CA6-97F5-04E0B8DD1B13} = {7C1D79F1-87BC-42C1-BD5A-CDE4044AC1BD}
+		{C075C6C8-B9CB-4AC0-9BDF-B2002B4AB99C} = {EA765165-0542-41C8-93F2-85787FEDEDFF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0DCB0756-34FA-4FD0-AE1D-D3F08B5B3A6B}

scripts/linux/nginx.conf

@@ -16,7 +16,7 @@ http {
     server {
         listen       80;
         server_name  blazor.zone;
-	    client_max_body_size 20m;
+        client_max_body_size 20m;
         rewrite ^(.*)$  https://www.blazor.zone$1 redirect;
         proxy_redirect  off;
         proxy_set_header Host $host;
@@ -28,8 +28,8 @@ http {
         listen      443 ssl;
         server_name blazor.zone;
         rewrite ^(.*)$  https://www.blazor.zone$1 redirect;
-        ssl_certificate ./cert/blazor.zone.cer;
-        ssl_certificate_key ./cert/blazor.zone.key;
+        ssl_certificate cert/blazor.zone.cer;
+        ssl_certificate_key cert/blazor.zone.key;
         ssl_session_cache shared:SSL:1m;
         ssl_session_timeout 5m;
         ssl_ciphers     HIGH:!aNULL:!MD5;
@@ -44,7 +44,7 @@ http {
     server {
         listen       80;
         server_name  www.blazor.zone;
-	    client_max_body_size 20m;
+        client_max_body_size 20m;
         rewrite ^(.*)$  https://$host$1 redirect;
         proxy_redirect  off;
         proxy_set_header Host $host;
@@ -55,8 +55,8 @@ http {
     server {
         listen      443 ssl;
         server_name www.blazor.zone;
-        ssl_certificate ./cert/www.blazor.zone.cer;
-        ssl_certificate_key ./cert/www.blazor.zone.key;
+        ssl_certificate cert/www.blazor.zone.cer;
+        ssl_certificate_key cert/www.blazor.zone.key;
         ssl_session_cache shared:SSL:1m;
         ssl_session_timeout 5m;
         ssl_ciphers     HIGH:!aNULL:!MD5;