fix: support sitemap locations for muliple servers

intershop · Nov 30, 2021 · bbf98ce · bbf98ce
1 parent f1af366
commit bbf98ce
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 34 deletions.
diff --git a/nginx/templates/multi-channel.conf.tmpl b/nginx/templates/multi-channel.conf.tmpl
@@ -65,6 +65,19 @@
     rewrite '^((.*){{ .path }})$' '$1{{$identityProvider}}';
 {{- end}}
 
+{{- define "LOCATION_TEMPLATE_FOR_SITEMAP" }}
+        {{- $icmBaseUrl := getenv "ICM_BASE_URL" }}
+        {{- $baseHref := ""}}{{ if (has . "baseHref")}}{{ $baseHref = .baseHref }}{{end}}
+        {{- $channel := .channel }}
+        {{- $application := "rest" }}{{ if (has . "application") }}{{ $application = .application }}{{ end }}
+        {{- $lang := "en_US" }}{{ if (has . "lang") }}{{ $lang = .lang }}{{ end }}
+      {{- if $icmBaseUrl }}
+      proxy_pass {{ $icmBaseUrl }}/INTERSHOP/static/WFS/{{ $channel }}/{{ $application }}/{{ $channel | strings.ReplaceAll "-Site" "" }}/{{ $lang }}/sitemaps/pwa/sitemap_;
+      {{- else }}
+      rewrite ^{{ $baseHref }}/sitemap.*$ {{ $baseHref }}/;
+      {{- end -}}
+{{- end }}
+
 {{- range $domain, $mapping := (ds "domains") }}
 server {
     server_name ~^{{ $domain }}$;
@@ -153,29 +166,33 @@ server {
     location / {
         {{- tmpl.Exec "LOCATION_TEMPLATE" $mapping }}
     }
+    location ^~ /sitemap_ {
+        {{- tmpl.Exec "LOCATION_TEMPLATE_FOR_SITEMAP" $mapping }}
+    }
   {{- else -}}
     {{ range $mapping }}
     location {{ .baseHref }} {
         {{- tmpl.Exec "LOCATION_TEMPLATE" . }}
     }
+    location ^~ {{ .baseHref }}{{if not ( .baseHref | strings.HasSuffix "/")}}/{{end}}sitemap_ {
+        {{- tmpl.Exec "LOCATION_TEMPLATE_FOR_SITEMAP" . }}
+    }
     {{ end }}
-  {{- if (has ($mapping | jsonpath "$..baseHref") "/") }}
-  {{- else }}
+    {{- if (has ($mapping | jsonpath "$..baseHref") "/") }}
+    {{- else }}
     location / {
         allow all;
         auth_basic off;
         {{ $first := index $mapping 0 -}}
         rewrite ^/$ "$scheme://$http_host{{ $first.baseHref }}/home" permanent;
         rewrite ^(.*)$ "$scheme://$http_host{{ $first.baseHref }}$request_uri" permanent;
     }
-  {{- end -}}
+    location ^~ /sitemap_ {
+        {{- tmpl.Exec "LOCATION_TEMPLATE_FOR_SITEMAP" $first }}
+    }
+    {{- end -}}
   {{- end }}
 
-{{- if (getenv "ICM_BASE_URL") }}
-    # we have the ICM_BASE_URL so we can include sitemap locations
-    #
-    include /etc/nginx/conf.d/sitemap.conf;
-{{- end }}
     # redirect server error pages to the static page /50x.html
     #
     error_page 500 502 503 504 /50x.html;

diff --git a/nginx/templates/sitemap.conf.tmpl b/nginx/templates/sitemap.conf.tmpl