]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
sirona-aem - remove AEM vhost www.cerec.com SIRONAADFR-1707
authorPhilipp Dallig <philipp.dallig@pixelpark.com>
Wed, 24 May 2017 08:54:15 +0000 (10:54 +0200)
committerPhilipp Dallig <philipp.dallig@pixelpark.com>
Wed, 24 May 2017 08:54:15 +0000 (10:54 +0200)
customer/sirona-aem/production.yaml

index 941e80635b1296580bd336fddbb5946a3e7417ce..65222dd0ec7b13797688f7e14c3baecd90bea0b3 100644 (file)
@@ -201,9 +201,6 @@ aem::domain_mappings:
   www.see-more-with-sirona.com:
     aem_path: '/content/see-more-with-sirona'
     create_sling_mapping: true
-  www.cerec.com:
-    aem_path: '/content/cerec'
-    create_sling_mapping: true
   lp.dentsplysirona.com:
     aem_path: '/content/landingpages'
     create_sling_mapping: true
@@ -1341,49 +1338,18 @@ infra::profile::aem::publish::pp_vhosts:
           - '^/en-us/security/dosage.html$ https://www1.dentsplysirona.com/en/solutions/topics/be-safe-see-more/security/dosage.html [R=301,L]'
           - '^/en-us/cases.html$ https://www1.dentsplysirona.com/en/solutions/topics/be-safe-see-more/cases.html [R=301,L]'
 
-# Sirona www.cerec-com
+# Sirona www.cerec-com - kein AEM-vHost
   cerec-com:
     serveraliases:
       - www.cerec.com
       - cerec.com
-    docroot: '/opt/adobe/www/cache/content/cerec'
     cert_servername: 'cerec.com'
     cert_customer: 'sirona'
     ssl_cert: '/etc/pki/tls/certs/cerec.com-cert.pem'
     ssl_key: '/etc/pki/tls/private/cerec.com-key.pem'
     ssl_chain: '/etc/pki/tls/certs/cerec.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-us'
-      - 'Accept-Language ^de 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: "/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/cerec'
-        sethandler: dispatcher-handler
-        options:
-          - FollowSymLinks
-      # error_documents
-      - provider: directory
-        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" }
+      - 'Accept-Language ^.*$ language=de-de'
     rewrites:
       - comment: 'http to https'
         rewrite_cond: