sirona-aem - change domain-mapping from spotlight and add language

rewrite based on browser language

diff --git a/customer/sirona-aem/production.yaml b/customer/sirona-aem/production.yaml
index fa89b7c81ba303f38b1b99080fb880b3a8de0590..a30438e5d883fbb128af597825f69d4a0f9eb7a4 100644 (file)
--- a/customer/sirona-aem/production.yaml
+++ b/customer/sirona-aem/production.yaml
@@ -143,9 +143,6 @@ aem::domain_mappings:
     aem_path: '/content/madeingermany'
     create_sling_mapping: true
   spotlight.dentsplysirona.com:
-    aem_path: '/content/dentsply-sirona-spotlight'
-    create_sling_mapping: true
-  stagingspotlight.dentsplysirona.com:
     aem_path: '/content/spotlight'
     create_sling_mapping: true
   my.cerec.com:
@@ -748,22 +745,21 @@ infra::profile::aem::publish::pp_vhosts:
     setenvif:
       - 'Origin "http(s)?://(www\.)?(sirona-cerec-test.azurewebsites.net|sirona-cerec-stage.azurewebsites.net|cerec.com|sirona-cerec-de.local:3000)$" AccessControlAllowOrigin=$0$1'
     setenvifnocase:
-      - 'Accept-Language ^.*$ language=en-us'
-      - 'Accept-Language ^de language=de-de'
-      - 'Accept-Language ^zh language=zh-cn'
+      - 'Accept-Language ^.*$ language=en'
+      - 'Accept-Language ^de language=de'
+      - 'Accept-Language ^zh language=zh'
+      - 'Accept-Language ^fr language=fr'
     headers:
       - 'add Access-Control-Allow-Origin %%{ich-trickse}{AccessControlAllowOrigin}e env=AccessControlAllowOrigin'
     aliases:
       - { alias: /error_custom/ , path: /var/www/html/error_custom/ }
     error_documents:
-      - { error_code: 404 , document: "/en-us/error-pages/404.html" }
-      - { error_code: 500 , document: "/en-us/error-pages/500.html" }
       - { error_code: 502 , document: "/error_custom/error.shtml" }
       - { error_code: 503 , document: "/error_custom/error.shtml" }
     directories:
       # docroot:
       - provider: directory
-        path: '/opt/adobe/www/cache/content/dentsply-sirona-spotlight'
+        path: '/opt/adobe/www/cache/content/spotlight'
         sethandler: dispatcher-handler
         options:
           - FollowSymLinks
@@ -772,16 +768,6 @@ infra::profile::aem::publish::pp_vhosts:
         path: /var/www/html/error_custom/
         options:
           - +Includes
-      - provider: locationmatch
-        path: '^/zh-cn/'
-        error_documents:
-          - { error_code: 404 , document: "/zh-cn/error-pages/404.html" }
-          - { error_code: 500 , document: "/zh-cn/error-pages/500.html" }
-      - provider: locationmatch
-        path: '^/de-de/'
-        error_documents:
-          - { error_code: 404 , document: "/de-de/error-pages/404.html" }
-          - { error_code: 500 , document: "/de-de/error-pages/500.html" }
     rewrites:
       - comment: 'http to https'
         rewrite_cond:
@@ -790,7 +776,7 @@ infra::profile::aem::publish::pp_vhosts:
           - '(.*) https://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [R=301,L]'
       - comment: 'lanugage Rewrite use Env Vars'
         rewrite_rule:
-          - '^/$ %%{ich-trickse}{REQUEST_SCHEME}://spotlight.dentsplysirona.com/%%{ich-trickse}{ENV:language}.html [R=301,L]'
+          - '^/$ %%{ich-trickse}{REQUEST_SCHEME}://spotlight.dentsplysirona.com/global/%%{ich-trickse}{ENV:language}.html [R=301,L]'
 # Sirona stagingspotlight.dentsplysirona.com
   stagingspotlight:
     serveraliases: