]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
sirona-aem language settings JIRA SIRONAMAIN-1208
authorAndreas Gerstenberg <gerstenberg@pixelpark.com>
Wed, 14 Mar 2018 14:52:00 +0000 (15:52 +0100)
committerAndreas Gerstenberg <gerstenberg@pixelpark.com>
Wed, 14 Mar 2018 14:52:00 +0000 (15:52 +0100)
customer/sirona-aem/production.yaml

index cde50712287afa0a1123cdcdd1567ee8415c067e..a9ac156e75c1e3d28991dbcdb91101c0e98509b6 100644 (file)
@@ -955,15 +955,18 @@ 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=de-de'
-      - 'Accept-Language ^en language=en'
+      - 'Accept-Language ^.*$ language=en'
+      - 'Accept-Language ^en-us$ language=en-us'
+      - 'Accept-Language ^de language=de-de'
+      - 'Accept-Language ^at language=de-de'
+      - 'Accept-Language ^ch language=de-de'
     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: "/de-de/error-pages/404.html" }
-      - { error_code: 500 , document: "/de-de/error-pages/500.html" }
+      - { error_code: 404 , document: "/en/error-pages/404.html" }
+      - { error_code: 500 , document: "/en/error-pages/500.html" }
       - { error_code: 502 , document: "/error_custom/error.shtml" }
       - { error_code: 503 , document: "/error_custom/error.shtml" }
     directories:
@@ -978,6 +981,16 @@ infra::profile::aem::publish::pp_vhosts:
         path: /var/www/html/error_custom/
         options:
           - +Includes
+      - 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" }
+      - provider: locationmatch
+        path: '^/en-us/'
+        error_documents:
+          - { error_code: 404 , document: "/en-us/error-pages/404.html" }
+          - { error_code: 500 , document: "/en-us/error-pages/500.html" }
     rewrites:
       - comment: 'http to https'
         rewrite_cond: