Merge pull request plone#1348 from plone/fix-nginx-config

stevepiercy · web-flow · commit fda3d7714767 · 2022-10-21T19:04:08.000+02:00
Fix nginx configuration.
diff --git a/docs/install/containers/examples/nginx-volto-plone-postgresql.md b/docs/install/containers/examples/nginx-volto-plone-postgresql.md
@@ -46,7 +46,7 @@ server {
   server_name  plone.localhost;
 
   location ~ /\+\+api\+\+($|/.*) {
-      rewrite ^/(\+\+api\+\+\/?)+($|/.*) /VirtualHostBase/http/$server_name/Plone/++api++/VirtualHostRoot/$1 break;
+      rewrite ^/(\+\+api\+\+\/?)+($|/.*) /VirtualHostBase/http/$server_name/Plone/++api++/VirtualHostRoot/$2 break;
       proxy_pass http://backend;
   }
 
diff --git a/docs/install/containers/examples/nginx-volto-plone-zeo.md b/docs/install/containers/examples/nginx-volto-plone-zeo.md
@@ -46,7 +46,7 @@ server {
   server_name  plone.localhost;
 
   location ~ /\+\+api\+\+($|/.*) {
-      rewrite ^/(\+\+api\+\+\/?)+($|/.*) /VirtualHostBase/http/$server_name/Plone/++api++/VirtualHostRoot/$1 break;
+      rewrite ^/(\+\+api\+\+\/?)+($|/.*) /VirtualHostBase/http/$server_name/Plone/++api++/VirtualHostRoot/$2 break;
       proxy_pass http://backend;
   }
 
diff --git a/docs/install/containers/examples/nginx-volto-plone.md b/docs/install/containers/examples/nginx-volto-plone.md
@@ -45,7 +45,7 @@ server {
   server_name  plone.localhost;
 
   location ~ /\+\+api\+\+($|/.*) {
-      rewrite ^/(\+\+api\+\+\/?)+($|/.*) /VirtualHostBase/http/$server_name/Plone/++api++/VirtualHostRoot/$1 break;
+      rewrite ^/(\+\+api\+\+\/?)+($|/.*) /VirtualHostBase/http/$server_name/Plone/++api++/VirtualHostRoot/$2 break;
       proxy_pass http://backend;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ server {`
`46`	`46`	`server_name plone.localhost;`
`47`	`47`
`48`	`48`	`location ~ /\+\+api\+\+($\|/.*) {`
`49`		`- rewrite ^/(\+\+api\+\+\/?)+($\|/.*) /VirtualHostBase/http/$server_name/Plone/++api++/VirtualHostRoot/$1 break;`
	`49`	`+ rewrite ^/(\+\+api\+\+\/?)+($\|/.*) /VirtualHostBase/http/$server_name/Plone/++api++/VirtualHostRoot/$2 break;`
`50`	`50`	`proxy_pass http://backend;`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ server {`
`45`	`45`	`server_name plone.localhost;`
`46`	`46`
`47`	`47`	`location ~ /\+\+api\+\+($\|/.*) {`
`48`		`- rewrite ^/(\+\+api\+\+\/?)+($\|/.*) /VirtualHostBase/http/$server_name/Plone/++api++/VirtualHostRoot/$1 break;`
	`48`	`+ rewrite ^/(\+\+api\+\+\/?)+($\|/.*) /VirtualHostBase/http/$server_name/Plone/++api++/VirtualHostRoot/$2 break;`
`49`	`49`	`proxy_pass http://backend;`
`50`	`50`	`}`
`51`	`51`