]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
sirona-aem - resolv SIRONAMAIN-1039
authorPhilipp Dallig <philipp.dallig@pixelpark.com>
Mon, 10 Apr 2017 12:41:21 +0000 (14:41 +0200)
committerPhilipp Dallig <philipp.dallig@pixelpark.com>
Mon, 10 Apr 2017 12:41:21 +0000 (14:41 +0200)
customer/sirona-aem/production.yaml

index e937e2948d0b86ee22bde2d23e0d3468133cf624..e28a346b82500736f27ba8129af6e59888fcf606 100644 (file)
@@ -173,9 +173,6 @@ aem::domain_mappings:
   www.danke-m1-hallo-zukunft.de:
     aem_path: '/content/M1'
     create_sling_mapping: true
-  brand.dentsplysirona.com:
-    aem_path: '/content/brand-control-center'
-    create_sling_mapping: true
   www.sirona.clinic:
     aem_path: '/content/clinic_solutions'
     create_sling_mapping: true
@@ -411,37 +408,15 @@ infra::profile::aem::publish::pp_vhosts:
           - '^/de/zukunft$ %%{ich-trickse}{REQUEST_SCHEME}://www.danke-m1-hallo-zukunft.de/de-de/zukunft.html [R=301,L]'
           - '^/de/faq$ %%{ich-trickse}{REQUEST_SCHEME}://www.danke-m1-hallo-zukunft.de/de-de/faq.html [R=301,L]'
           - '^/de/ %%{ich-trickse}{REQUEST_SCHEME}://www.danke-m1-hallo-zukunft.de/de-de.html [R=301,L]'
+# brand.dentsplysirona.com - kein AEM VHost
   brand:
     serveraliases:
       - brand.dentsplysirona.com
-    docroot: '/opt/adobe/www/cache/content/brand-control-center'
     ssl_cert: '/etc/pki/tls/certs/wildcard.dentsplysirona.com-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.dentsplysirona.com-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.dentsplysirona.com-cert.pem'
     docroot_owner: apache
-    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'
-    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: 502 , document: "/error_custom/error.shtml" }
-      - { error_code: 503 , document: "/error_custom/error.shtml" }
     directories:
-      # docroot:
-      - provider: directory
-        path: '/opt/adobe/www/cache/content/brand-control-center'
-        sethandler: dispatcher-handler
-        options:
-          - FollowSymLinks
-      # error_documents
-      - provider: directory
-        path: /var/www/html/error_custom/
-        options:
-          - +Includes
       # htaccess
       - provider: location
         path: '/'
@@ -454,73 +429,149 @@ infra::profile::aem::publish::pp_vhosts:
         require:
           - local
     rewrites:
-      - comment: 'http to https'
-        rewrite_cond:
-          - '%%{ich-trickse}{HTTPS} !=on'
+      - comment: 'Rewrite to Hub brand-control-center'
         rewrite_rule:
-          - '(.*) https://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [R=301,L]'
-      - comment: 'lanugage Rewrite use Env Vars'
+          - '^/$ https://hub.dentsplysirona.com/en/brand-control-center.html [R=301,L]'
+      - comment: 'Reodering site, old pages'
         rewrite_rule:
-          - '^/$ %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/%%{ich-trickse}{ENV:language}.html [R=301,L]'
-      - comment: 'Reodering site'
+        - '^/en-us.html https://hub.dentsplysirona.com/en/brand-control-center.html [R=301,L]'
+        - '^/en-us/basics.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics.html [R=301,L]'
+        - '^/en-us/basics/colors.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/colors.html [R=301,L]'
+        - '^/en-us/basics/icons.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/icons.html [R=301,L]'
+        - '^/en-us/basics/icons/basic-icons.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/icons/basic-icons.html [R=301,L]'
+        - '^/en-us/basics/icons/social-icons.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/icons/social-icons.html [R=301,L]'
+        - '^/en-us/basics/icons/file-icons.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/icons/file-icons.html [R=301,L]'
+        - '^/en-us/basics/images.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/images.html [R=301,L]'
+        - '^/en-us/basics/typography.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/typography.html [R=301,L]'
+        - '^/en-us/basics/typography/headlines.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/typography/headlines.html [R=301,L]'
+        - '^/en-us/basics/typography/copytext.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/typography/copytext.html [R=301,L]'
+        - '^/en-us/basics/logos.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/logos.html [R=301,L]'
+        - '^/en-us/basics/fav-icon.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/fav-icon.html [R=301,L]'
+        - '^/en-us/interaction-elements.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/interaction-elements.html [R=301,L]'
+        - '^/en-us/interaction-elements/buttons.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/interaction-elements/buttons.html [R=301,L]'
+        - '^/en-us/interaction-elements/arrows.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/interaction-elements/arrows.html [R=301,L]'
+        - '^/en-us/interaction-elements/text-links.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/interaction-elements/text-links.html [R=301,L]'
+        - '^/en-us/interaction-elements/breadcrumbs.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/interaction-elements/breadcrumbs.html [R=301,L]'
+        - '^/en-us/interaction-elements/scrolling.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/interaction-elements/scrolling.html [R=301,L]'
+        - '^/en-us/digital-communication.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/digital-communication.html [R=301,L]'
+        - '^/en-us/digital-communication/domains-vanity-urls.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/digital-communication/domains-vanity-urls.html [R=301,L]'
+        - '^/en-us/digital-communication/email-signature.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/digital-communication/email-signature.html [R=301,L]'
+        - '^/en-us/digital-communication/json-api.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/digital-communication/json-api.html [R=301,L]'
+        - '^/en-us/digital-communication/trademarks.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/digital-communication/trademarks.html [R=301,L]'
+        - '^/en-us/faq.html https://hub.dentsplysirona.com/en/brand-control-center/digital-guide.html [R=301,L]'
+        - '^/en-us/aem-component-guide.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide.html [R=301,L]'
+        - '^/en-us/aem-component-guide/headline.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/text-components/headline.html [R=301,L]'
+        - '^/en-us/aem-component-guide/text.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/text-components/text.html [R=301,L]'
+        - '^/en-us/aem-component-guide/text-image.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/text-components/text-image.html [R=301,L]'
+        - '^/en-us/aem-component-guide/text-video.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/text-components/text-video.html [R=301,L]'
+        - '^/en-us/aem-component-guide/table.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/text-components/table.html [R=301,L]'
+        - '^/en-us/aem-component-guide/image.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/image-components/image.html [R=301,L]'
+        - '^/en-us/aem-component-guide/image-gallery.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/image-components/image-gallery.html [R=301,L]'
+        - '^/en-us/aem-component-guide/image-comparison.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/image-components/image-comparison.html [R=301,L]'
+        - '^/en-us/aem-component-guide/video.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/video-components/video.html [R=301,L]'
+        - '^/en-us/aem-component-guide/download-list.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/download-components/download-list.html [R=301,L]'
+        - '^/en-us/aem-component-guide/stickout.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/download-components/stickout.html [R=301,L]'
+        - '^/en-us/aem-component-guide/asset-library.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/download-components/asset-library.html [R=301,L]'
+        - '^/en-us/aem-component-guide/quote.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/quote-components/quote.html [R=301,L]'
+        - '^/en-us/aem-component-guide/quote-block.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/quote-components/quote-block.html [R=301,L]'
+        - '^/en-us/aem-component-guide/quote-banner.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/quote-components/quote-banner.html [R=301,L]'
+        - '^/en-us/aem-component-guide/fact.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/feature-components/fact.html [R=301,L]'
+        - '^/en-us/aem-component-guide/bullet-list.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/feature-components/bullet-list.html [R=301,L]'
+        - '^/en-us/aem-component-guide/benefit-list.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/feature-components/benefit-list.html [R=301,L]'
+        - '^/en-us/aem-component-guide/hero.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/hero-components/hero.html [R=301,L]'
+        - '^/en-us/aem-component-guide/reference.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/system-components/reference.html [R=301,L]'
+        - '^/en-us/aem-component-guide/accordion.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/other-components/accordion.html [R=301,L]'
+        - '^/en-us/aem-component-guide/issuu.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/other-components/issuu.html [R=301,L]'
+        - '^/en-us/aem-component-guide/process.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/other-components/process.html [R=301,L]'
+        - '^/en-us/aem-component-guide/product-highlight.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/product-components/product-highlight.html [R=301,L]'
+        - '^/en-us/aem-component-guide/callout.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/call-to-action-components/callout.html [R=301,L]'
+        - '^/en-us/aem-component-guide/hotline.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/call-to-action-components/hotline.html [R=301,L]'
+        - '^/en-us/aem-component-guide/teaser.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/teaser-components/teaser.html [R=301,L]'
+        - '^/en-us/aem-component-guide/teaser-mini.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/teaser-components/teaser-mini.html [R=301,L]'
+        - '^/en-us/aem-component-guide/tile-rectangular.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/teaser-components/tile-rectangular.html [R=301,L]'
+        - '^/en-us/aem-component-guide/tile-square.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/teaser-components/tile-square.html [R=301,L]'
+        - '^/en-us/aem-component-guide/teaser-blocklist.html https://hub.dentsplysirona.com/en/website-management/aem-component-guide/teaser-components/teaser-blocklist.html [R=301,L]'
+      - comment: 'Move to hub.dentsplysirona.com'
         rewrite_rule:
-        - '^/en-us.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en.html [R=301,L]'
-        - '^/en-us/basics.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/basics.html [R=301,L]'
-        - '^/en-us/basics/colors.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/basics/colors.html [R=301,L]'
-        - '^/en-us/basics/icons.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/basics/icons.html [R=301,L]'
-        - '^/en-us/basics/icons/basic-icons.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/basics/icons/basic-icons.html [R=301,L]'
-        - '^/en-us/basics/icons/social-icons.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/basics/icons/social-icons.html [R=301,L]'
-        - '^/en-us/basics/icons/file-icons.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/basics/icons/file-icons.html [R=301,L]'
-        - '^/en-us/basics/images.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/basics/images.html [R=301,L]'
-        - '^/en-us/basics/typography.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/basics/typography.html [R=301,L]'
-        - '^/en-us/basics/typography/headlines.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/basics/typography/headlines.html [R=301,L]'
-        - '^/en-us/basics/typography/copytext.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/basics/typography/copytext.html [R=301,L]'
-        - '^/en-us/basics/logos.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/basics/logos.html [R=301,L]'
-        - '^/en-us/basics/fav-icon.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/basics/fav-icon.html [R=301,L]'
-        - '^/en-us/interaction-elements.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/interaction-elements.html [R=301,L]'
-        - '^/en-us/interaction-elements/buttons.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/interaction-elements/buttons.html [R=301,L]'
-        - '^/en-us/interaction-elements/arrows.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/interaction-elements/arrows.html [R=301,L]'
-        - '^/en-us/interaction-elements/text-links.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/interaction-elements/text-links.html [R=301,L]'
-        - '^/en-us/interaction-elements/breadcrumbs.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/interaction-elements/breadcrumbs.html [R=301,L]'
-        - '^/en-us/interaction-elements/scrolling.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/interaction-elements/scrolling.html [R=301,L]'
-        - '^/en-us/digital-communication.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/digital-communication.html [R=301,L]'
-        - '^/en-us/digital-communication/domains-vanity-urls.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/digital-communication/domains-vanity-urls.html [R=301,L]'
-        - '^/en-us/digital-communication/email-signature.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/digital-communication/email-signature.html [R=301,L]'
-        - '^/en-us/digital-communication/json-api.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/digital-communication/json-api.html [R=301,L]'
-        - '^/en-us/digital-communication/trademarks.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide/digital-communication/trademarks.html [R=301,L]'
-        - '^/en-us/faq.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/digital-guide.html [R=301,L]'
-        - '^/en-us/aem-component-guide.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide.html [R=301,L]'
-        - '^/en-us/aem-component-guide/headline.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/text-components/headline.html [R=301,L]'
-        - '^/en-us/aem-component-guide/text.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/text-components/text.html [R=301,L]'
-        - '^/en-us/aem-component-guide/text-image.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/text-components/text-image.html [R=301,L]'
-        - '^/en-us/aem-component-guide/text-video.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/text-components/text-video.html [R=301,L]'
-        - '^/en-us/aem-component-guide/table.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/text-components/table.html [R=301,L]'
-        - '^/en-us/aem-component-guide/image.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/image-components/image.html [R=301,L]'
-        - '^/en-us/aem-component-guide/image-gallery.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/image-components/image-gallery.html [R=301,L]'
-        - '^/en-us/aem-component-guide/image-comparison.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/image-components/image-comparison.html [R=301,L]'
-        - '^/en-us/aem-component-guide/video.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/video-components/video.html [R=301,L]'
-        - '^/en-us/aem-component-guide/download-list.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/download-components/download-list.html [R=301,L]'
-        - '^/en-us/aem-component-guide/stickout.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/download-components/stickout.html [R=301,L]'
-        - '^/en-us/aem-component-guide/asset-library.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/download-components/asset-library.html [R=301,L]'
-        - '^/en-us/aem-component-guide/quote.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/quote-components/quote.html [R=301,L]'
-        - '^/en-us/aem-component-guide/quote-block.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/quote-components/quote-block.html [R=301,L]'
-        - '^/en-us/aem-component-guide/quote-banner.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/quote-components/quote-banner.html [R=301,L]'
-        - '^/en-us/aem-component-guide/fact.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/feature-components/fact.html [R=301,L]'
-        - '^/en-us/aem-component-guide/bullet-list.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/feature-components/bullet-list.html [R=301,L]'
-        - '^/en-us/aem-component-guide/benefit-list.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/feature-components/benefit-list.html [R=301,L]'
-        - '^/en-us/aem-component-guide/hero.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/hero-components/hero.html [R=301,L]'
-        - '^/en-us/aem-component-guide/reference.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/system-components/reference.html [R=301,L]'
-        - '^/en-us/aem-component-guide/accordion.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/other-components/accordion.html [R=301,L]'
-        - '^/en-us/aem-component-guide/issuu.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/other-components/issuu.html [R=301,L]'
-        - '^/en-us/aem-component-guide/process.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/other-components/process.html [R=301,L]'
-        - '^/en-us/aem-component-guide/product-highlight.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/product-components/product-highlight.html [R=301,L]'
-        - '^/en-us/aem-component-guide/callout.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/call-to-action-components/callout.html [R=301,L]'
-        - '^/en-us/aem-component-guide/hotline.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/call-to-action-components/hotline.html [R=301,L]'
-        - '^/en-us/aem-component-guide/teaser.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/teaser-components/teaser.html [R=301,L]'
-        - '^/en-us/aem-component-guide/teaser-mini.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/teaser-components/teaser-mini.html [R=301,L]'
-        - '^/en-us/aem-component-guide/tile-rectangular.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/teaser-components/tile-rectangular.html [R=301,L]'
-        - '^/en-us/aem-component-guide/tile-square.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/teaser-components/tile-square.html [R=301,L]'
-        - '^/en-us/aem-component-guide/teaser-blocklist.html %%{ich-trickse}{REQUEST_SCHEME}://%%{ich-trickse}{HTTP_HOST}/en/website-management/aem-component-guide/teaser-components/teaser-blocklist.html [R=301,L]'
+        - '^/en.html$ https://hub.dentsplysirona.com/en/brand-control-center.html [R=301,L]'
+        - '^/en/digital-guide.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide.html [R=301,L]'
+        - '^/en/digital-guide/basics.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics.html [R=301,L]'
+        - '^/en/digital-guide/basics/colors.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/colors.html [R=301,L]'
+        - '^/en/digital-guide/basics/icons.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/icons.html [R=301,L]'
+        - '^/en/digital-guide/basics/icons/basic-icons.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/icons/basic-icons.html [R=301,L]'
+        - '^/en/digital-guide/basics/icons/social-icons.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/icons/social-icons.html [R=301,L]'
+        - '^/en/digital-guide/basics/icons/file-icons.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/icons/file-icons.html [R=301,L]'
+        - '^/en/digital-guide/basics/images.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/images.html [R=301,L]'
+        - '^/en/digital-guide/basics/typography.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/typography.html [R=301,L]'
+        - '^/en/digital-guide/basics/typography/headlines.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/typography/headlines.html [R=301,L]'
+        - '^/en/digital-guide/basics/typography/copytext.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/typography/copytext.html [R=301,L]'
+        - '^/en/digital-guide/basics/logos.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/logos.html [R=301,L]'
+        - '^/en/digital-guide/basics/fav-icon.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/basics/fav-icon.html [R=301,L]'
+        - '^/en/digital-guide/interaction-elements.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/interaction-elements.html [R=301,L]'
+        - '^/en/digital-guide/interaction-elements/buttons.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/interaction-elements/buttons.html [R=301,L]'
+        - '^/en/digital-guide/interaction-elements/arrows.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/interaction-elements/arrows.html [R=301,L]'
+        - '^/en/digital-guide/interaction-elements/text-links.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/interaction-elements/text-links.html [R=301,L]'
+        - '^/en/digital-guide/interaction-elements/breadcrumbs.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/interaction-elements/breadcrumbs.html [R=301,L]'
+        - '^/en/digital-guide/interaction-elements/scrolling.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/interaction-elements/scrolling.html [R=301,L]'
+        - '^/en/digital-guide/digital-communication.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/digital-communication.html [R=301,L]'
+        - '^/en/digital-guide/digital-communication/domains-vanity-urls.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/digital-communication/domains-vanity-urls.html [R=301,L]'
+        - '^/en/digital-guide/digital-communication/email-signature.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/digital-communication/email-signature.html [R=301,L]'
+        - '^/en/digital-guide/digital-communication/json-api.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/digital-communication/json-api.html [R=301,L]'
+        - '^/en/digital-guide/digital-communication/trademarks.html$ https://hub.dentsplysirona.com/en/brand-control-center/digital-guide/digital-communication/trademarks.html [R=301,L]'
+        - '^/en/website-management.html$ https://hub.dentsplysirona.com/en/website-management.html [R=301,L]'
+        - '^/en/website-management/content-script-topics.html$ https://hub.dentsplysirona.com/en/website-management/content-script-topics.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/hero-components/hero.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/hero-components/hero.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/hero-components/hero-richtext.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/hero-components/hero-richtext.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/hero-components/hero-background-color.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/hero-components/hero-background-color.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/text-components/text.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/text-components/text.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/text-components/text-image.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/text-components/text-image.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/text-components/text-video.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/text-components/text-video.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/text-components/headline.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/text-components/headline.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/text-components/table.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/text-components/table.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/image-components/image.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/image-components/image.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/image-components/image-gallery.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/image-components/image-gallery.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/image-components/image-comparison.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/image-components/image-comparison.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/video-components/video.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/video-components/video.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/quote-components/quote.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/quote-components/quote.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/quote-components/quote-block.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/quote-components/quote-block.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/quote-components/quote-banner.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/quote-components/quote-banner.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/product-components/product-summary.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/product-components/product-summary.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/product-components/product-highlight.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/product-components/product-highlight.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/feature-components/benefit-list.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/feature-components/benefit-list.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/feature-components/bullet-list.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/feature-components/bullet-list.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/feature-components/fact.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/feature-components/fact.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/download-components/download-list.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/download-components/download-list.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/download-components/asset-library.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/download-components/asset-library.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/download-components/stickout.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/download-components/stickout.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/news-components/teaser-news-list.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/news-components/teaser-news-list.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/other-components/accordion.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/other-components/accordion.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/other-components/button-list.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/other-components/button-list.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/other-components/process.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/other-components/process.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/other-components/issuu.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/other-components/issuu.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/system-components/reference.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/system-components/reference.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/call-to-action-components/callout.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/call-to-action-components/callout.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/call-to-action-components/hotline.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/call-to-action-components/hotline.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/call-to-action-components/forms.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/call-to-action-components/forms.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/call-to-action-components/forms/form-thank-you.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/call-to-action-components/forms/form-thank-you.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/teaser-components/teaser.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/teaser-components/teaser.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/teaser-components/teaser-mini.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/teaser-components/teaser-mini.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/teaser-components/tile-rectangular.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/teaser-components/tile-rectangular.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/teaser-components/tile-square.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/teaser-components/tile-square.html [R=301,L]'
+        - '^/en/website-management/aem-component-guide/teaser-components/teaser-blocklist.html$ https://hub.dentsplysirona.com/en/website-management/aem-component-guide/teaser-components/teaser-blocklist.html [R=301,L]'
+        - '^/en/website-management/newsroom-management.html$ https://hub.dentsplysirona.com/en/website-management/newsroom-management.html [R=301,L]'
+        - '^/en/website-management/newsroom-management/article-page.html$ https://hub.dentsplysirona.com/en/website-management/newsroom-management/article-page.html [R=301,L]'
+        - '^/en/website-management/newsroom-management/how-to-article-page.html$ https://hub.dentsplysirona.com/en/website-management/newsroom-management/how-to-article-page.html [R=301,L]'
+        - '^/en/spotlight.html$ https://hub.dentsplysirona.com/en/brand-control-center/spotlight.html [R=301,L]'
+        - '^/en/spotlight/getting-started.html$ https://hub.dentsplysirona.com/en/brand-control-center/spotlight/getting-started.html [R=301,L]'
+        - '^/en/spotlight/editorial-style-guide.html$ https://hub.dentsplysirona.com/en/brand-control-center/spotlight/editorial-style-guide.html [R=301,L]'
+        - '^/en/spotlight/colors.html$ https://hub.dentsplysirona.com/en/brand-control-center/spotlight/colors.html [R=301,L]'
+        - '^/en/spotlight/typography.html$ https://hub.dentsplysirona.com/en/brand-control-center/spotlight/typography.html [R=301,L]'
+        - '^/en/spotlight/photos.html$ https://hub.dentsplysirona.com/en/brand-control-center/spotlight/photos.html [R=301,L]'
+        - '^/en/spotlight/graphic-structure.html$ https://hub.dentsplysirona.com/en/brand-control-center/spotlight/graphic-structure.html [R=301,L]'
+        - '^/en/spotlight/print-specs.html$ https://hub.dentsplysirona.com/en/brand-control-center/spotlight/print-specs.html [R=301,L]'
+        - '^/en/spotlight/digital-style-guide.html$ https://hub.dentsplysirona.com/en/brand-control-center/spotlight/digital-style-guide.html [R=301,L]'
+        - '^/en/version-history.html$ https://hub.dentsplysirona.com/en/brand-control-center/version-history.html [R=301,L]'
   hub:
     serveraliases:
       - hub.dentsplysirona.com
@@ -532,7 +583,7 @@ 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 ^.*$ language=en'
     headers:
       - 'add Access-Control-Allow-Origin %%{ich-trickse}{AccessControlAllowOrigin}e env=AccessControlAllowOrigin'
     aliases:
@@ -1892,87 +1943,6 @@ aem::dispatcher::publish_farm:
       - 'Expires'
       - 'Content-Type'
       - 'Access-Control-Allow-Origin'
-  brand:
-    virtualhosts:
-      - 'brand.dentsplysirona.com'
-    clientheaders:
-      - '*'
-    renders:
-      - { hostname: "127.0.0.1", port: '4503' }
-    filter:
-      - { type: 'deny', glob: '*' }
-      - { type: 'allow', url: '/' }
-      - { type: 'allow', url: '*.html' }
-      - { type: 'allow', url: '*.css'   }  # enable css
-      - { type: 'allow', url: '*.gif'   }  # enable gifs
-      - { type: 'allow', url: '*.ico'   }  # enable icos
-      - { type: 'allow', url: '*.js'    }  # enable javascript
-      - { type: 'allow', url: '*.png'   }  # enable png
-      - { type: 'allow', url: '*.swf'   }  # enable flash
-      - { type: 'allow', url: '*.jpg'   }  # enable jpg
-      - { type: 'allow', url: '*.jpeg'  }  # enable jpeg
-      - { type: 'allow', url: '*.svg'  }  # enable svg
-      - { type: 'allow', url: '*.ttf'  }  # enable ttf
-      - { type: 'allow', url: '*.woff'  }  # enable woff
-      - { type: 'allow', url: '*.woff2'  }  # enable woff2
-      - { type: 'allow', url: '*.eot'  }  # enable eot
-      - { type: 'allow', url: '*.pdf'  }  # enable pdf
-      - { type: 'allow', url: '*.wmv'  }  # enable wmv
-      - { type: 'allow', url: '*.psd'  }  # enable psd (Adobe Photoshop Dokument)
-      - { type: 'allow', url: '*.tif'  }  # enable tif
-      - { type: 'allow', url: '*.zip'  }  # enable zip
-      - { type: 'allow', url: '*.exe'  }  # enable exe
-      - { type: 'allow', url: '*.msi'  }  # enable msi
-      - { type: 'allow', url: '*.indd'  }  # enable indd (Adobe Indesign Dokument)
-      # Enable features
-      - { type: 'allow', url: '/libs/cq/personalization/*' } # enable personalization
-      - { type: 'allow', url: '/content/dam/api.json' } # enable generic asset JSON API
-      - { type: 'allow', url: '*.assetlibrary.json' } # enable asset library JSON API
-      - { type: 'allow', url: '*.articlelibrary.json' } # enable article library JSON API
-      - { type: 'allow', url: '*.assetdata.json' } # enable download basket JSON API
-      - { type: 'allow', method: 'post', url: '*.forms.html' } # enable forms
-      # Security Rules
-      - { type: 'deny', url: '/etc/'  }
-      - { type: 'deny', url: '/libs/'  }
-      - { type: 'allow', url: '/etc/designs/*'  }
-      - { type: 'allow', url: '/etc/clientlibs/*'  }
-      - { type: 'allow', url: '/etc/segmentation.segment.js'  }
-      - { type: 'allow', url: '/libs/cq/personalization/components/clickstreamcloud/content/config.json'  }
-      - { type: 'allow', url: '/libs/wcm/stats/tracker.js'  }
-      - { type: 'allow', url: '/libs/cq/personalization/*'  }  #  (JS, CSS and JSON)
-      - { type: 'allow', url: '/libs/cq/security/userinfo.json'  }  #  (CQ user information)
-      - { type: 'allow', url: '/libs/granite/security/currentuser.json'  }  #  (data must not be cached)
-      - { type: 'allow', url: '/libs/cq/i18n/*'  }  #  (Internalization)
-      # CSRF
-      - { type: 'allow', url: '/libs/granite/csrf/token.json' } # enable CSRF token
-      # Deny content grabbing
-      - { type: 'deny', url: '*.infinity.json' }
-      - { type: 'deny', url: '*.tidy.json'     }
-      - { type: 'deny', url: '*.sysview.xml'   }
-      - { type: 'deny', url: '*.docview.json'  }
-      - { type: 'deny', url: '*.docview.xml'   }
-      - { type: 'deny', url: '*.*[0-9].json'   }
-      # Deny query
-      - { type: 'deny', url: '*.query.json' }
-    cache_docroot: '/opt/adobe/www/cache/content/brand-control-center'
-    cache_rules:
-      - { type: 'allow', glob: '*' }
-    cache_invalidate:
-      - { type: 'deny', glob: '*' }
-      - { type: 'allow', glob: '*.html' }
-      - { type: 'allow', glob: '/etc/segmentation.segment.js' }
-      - { type: 'allow', glob: '*/analytics.sitecatalyst.js' }
-    cache_allowed_clients:
-      - { type: 'deny', glob: '*' }
-      - { type: 'allow', glob: '127.0.0.1' }
-    cache_headers:
-      - 'X-Content-Type-Options'
-      - 'X-Frame-Options'
-      - 'X-XSS-Protection'
-      - 'Last-Modified'
-      - 'Expires'
-      - 'Content-Type'
-      - 'Access-Control-Allow-Origin'
   hub:
     virtualhosts:
       - 'hub.dentsplysirona.com'