From: Andreas Gerstenberg Date: Wed, 14 Mar 2018 14:52:00 +0000 (+0100) Subject: sirona-aem language settings JIRA SIRONAMAIN-1208 X-Git-Tag: v0.1.0~1484 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=4b52ffca70fc01b48f698acd7adc77c5ef75cd8e;p=pixelpark%2Fhiera.git sirona-aem language settings JIRA SIRONAMAIN-1208 --- diff --git a/customer/sirona-aem/production.yaml b/customer/sirona-aem/production.yaml index cde50712..a9ac156e 100644 --- a/customer/sirona-aem/production.yaml +++ b/customer/sirona-aem/production.yaml @@ -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: