From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Fri, 17 Mar 2017 15:30:11 +0000 (+0100)
Subject: sirona-aem - Livegang corporate and career website SIRONAMAIN-958
X-Git-Tag: v0.1.0~3420
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=6eab10887310aba6098a0996b1d2eb75efc1f3a8;p=pixelpark%2Fhiera.git

sirona-aem - Livegang corporate and career website SIRONAMAIN-958
---

diff --git a/customer/sirona-aem/production.yaml b/customer/sirona-aem/production.yaml
index 1a94f0c4..7cb04bff 100644
--- a/customer/sirona-aem/production.yaml
+++ b/customer/sirona-aem/production.yaml
@@ -240,15 +240,6 @@ aem::domain_mappings:
     aem_path: '/content/dam'
     create_sling_mapping: true
 # temporaer till Staging environement
-  stagingcorporate.dentsplysirona.com:
-    aem_path: '/content/corporate'
-    create_sling_mapping: true
-  stagingcareer.dentsplysirona.com:
-    aem_path: '/content/career'
-    create_sling_mapping: true
-  stagingcareers.dentsplysirona.com:
-    aem_path: '/content/career'
-    create_sling_mapping: true
   stagingnews.dentsplysirona.com:
     aem_path: '/content/newsroom'
     create_sling_mapping: true
@@ -1256,7 +1247,6 @@ site::profile::aem::publish::pp_vhosts:
   corporate-dentsplysirona:
     serveraliases:
       - corporate.dentsplysirona.com
-      - stagingcorporate.dentsplysirona.com
     docroot: '/var/www/html/cache/content/corporate'
     ssl_cert: '/etc/pki/tls/certs/wildcard.dentsplysirona.com-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.dentsplysirona.com-key.pem'
@@ -1266,9 +1256,9 @@ site::profile::aem::publish::pp_vhosts:
       - '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'
-#      - 'Accept-Language ^de language=de'
-#      - 'Accept-Language ^es language=es'
-#      - 'Accept-Language ^fr language=fr'
+      - 'Accept-Language ^de language=de'
+      - 'Accept-Language ^es language=es'
+      - 'Accept-Language ^fr language=fr'
     headers:
       - 'add Access-Control-Allow-Origin %%{ich-trickse}{AccessControlAllowOrigin}e env=AccessControlAllowOrigin'
     aliases:
@@ -1290,17 +1280,6 @@ site::profile::aem::publish::pp_vhosts:
         path: /var/www/html/error_custom/
         options:
           - +Includes
-      # htaccess
-      - provider: location
-        path: '/'
-        auth_type: Digest
-        auth_name: preview
-        auth_digest_provider: file
-        auth_digest_algorithm: MD5
-        auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'valid-user'
-        require:
-          - local
       - provider: locationmatch
         path: '^/de/'
         error_documents:
@@ -1329,8 +1308,6 @@ site::profile::aem::publish::pp_vhosts:
   career-dentsplysirona:
     serveraliases:
       - career.dentsplysirona.com
-      - stagingcareer.dentsplysirona.com
-      - stagingcareers.dentsplysirona.com
     docroot: '/var/www/html/cache/content/career'
     ssl_cert: '/etc/pki/tls/certs/wildcard.dentsplysirona.com-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.dentsplysirona.com-key.pem'
@@ -1340,9 +1317,9 @@ site::profile::aem::publish::pp_vhosts:
       - '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'
-#      - 'Accept-Language ^de language=de'
-#      - 'Accept-Language ^es language=es'
-#      - 'Accept-Language ^fr language=fr'
+      - 'Accept-Language ^de language=de'
+      - 'Accept-Language ^es language=es'
+      - 'Accept-Language ^fr language=fr'
     headers:
       - 'add Access-Control-Allow-Origin %%{ich-trickse}{AccessControlAllowOrigin}e env=AccessControlAllowOrigin'
     aliases:
@@ -1365,16 +1342,6 @@ site::profile::aem::publish::pp_vhosts:
         options:
           - +Includes
       # htaccess
-      - provider: location
-        path: '/'
-        auth_type: Digest
-        auth_name: preview
-        auth_digest_provider: file
-        auth_digest_algorithm: MD5
-        auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'valid-user'
-        require:
-          - local
       - provider: locationmatch
         path: '^/de/'
         error_documents: