sirona-aem - Rückbau www.plug-and-ray.com

diff --git a/customer/sirona-aem/production.yaml b/customer/sirona-aem/production.yaml
index 480b9977b7800dc809fefefc82646c01a1ef5369..9628f5f2364b0a415f01bc9589659ebe3ed7183c 100644 (file)
--- a/customer/sirona-aem/production.yaml
+++ b/customer/sirona-aem/production.yaml
@@ -166,9 +166,6 @@ aem::domain_mappings:
   ids.dentsplysirona.com:
     aem_path: '/content/ids-2017'
     create_sling_mapping: true
-  www.plug-and-ray.com:
-    aem_path: '/content/plug-and-ray'
-    create_sling_mapping: true
   corporate.dentsplysirona.com:
     aem_path: '/content/corporate'
     create_sling_mapping: true
@@ -1393,48 +1390,13 @@ infra::profile::aem::publish::pp_vhosts:
       - comment: 'lanugage Rewrite use Env Vars'
         rewrite_rule:
           - '^/$ %%{ich-trickse}{REQUEST_SCHEME}://ids.dentsplysirona.com/%%{ich-trickse}{ENV:language}.html [R=301,L]'
-# Sirona www.plug-and-ray.com
+# Sirona www.plug-and-ray.com  - kein AEM VHost
   plug-and-ray:
     serveraliases:
       - plug-and-ray.com
       - www.plug-and-ray.com
-    docroot: '/opt/adobe/www/cache/content/plug-and-ray'
     ssl: false
-    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=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: 502 , document: "/error_custom/error.shtml" }
-      - { error_code: 503 , document: "/error_custom/error.shtml" }
-    directories:
-      # docroot:
-      - provider: directory
-        path: '/opt/adobe/www/cache/content/plug-and-ray'
-        sethandler: dispatcher-handler
-        options:
-          - FollowSymLinks
-      # error_documents
-      - provider: directory
-        path: /var/www/html/error_custom/
-        options:
-          - +Includes
-#    rewrites:
-#      - comment: 'lanugage Rewrite use Env Vars'
-#        rewrite_rule:
-#          - '^/$ %%{ich-trickse}{REQUEST_SCHEME}://www.plug-and-ray.com/%%{ich-trickse}{ENV:language}.html [R=301,L]'
-    rewrites:
-      - comment: 'Rewrite all from this domain to Flagship-Site'
-        rewrite_rule:
-          - '(.*) https://www1.dentsplysirona.com/de-de/loesungen/themen/plug-and-ray.html [R=301,L]'
-
+    redirect_dest: 'https://www1.dentsplysirona.com/de-de/loesungen/themen/plug-and-ray.html'
 # Sirona corporate.dentsplysirona.com
   corporate-dentsplysirona:
     serveraliases:
@@ -3111,89 +3073,6 @@ aem::dispatcher::publish_farm:
       - 'Expires'
       - 'Content-Type'
       - 'Access-Control-Allow-Origin'
-  plug-and-ray:
-    virtualhosts:
-      - 'plug-and-ray.com'
-      - 'www.plug-and-ray.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', url: '*.updatecheck.json' } # enable update check
-      - { 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/plug-and-ray'
-    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'
   corporate-dentsplysirona:
     virtualhosts:
       - 'corporate.dentsplysirona.com'