MHK - compress js

diff --git a/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml
index 57dad1c08819f57c6f2ccd77687e539addc1841c..a8f8033cef20634e4d4d05550d272aced6c24fe9 100644 (file)
--- a/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml
@@ -51,27 +51,35 @@ infra::profile::apache::pp_vhosts:
       - www-kueche-de.pixelpark.net
       - www01-mhk-kueche-de.pixelpark.net
     ssl: false
+    directories:
+      - provider: filesmatch
+        path: '\.js$'
+        set_output_filter: 'DEFLATE'
     rewrites:
-      - nonwww:
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(.*)\.kueche\.de$ [NC]'
         rewrite_rule:
           - '^(.*)$ http://kueche.de$1 [R=301,L]'
-      - nonwww2:
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^www-kueche-de\.pixelpark\.net$ [NC]'
           - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
         rewrite_rule:
           - '^(.*)$ https://www-kueche-de.pixelpark.net$1 [R=301,L]'
-      - to_ssl:
-        comment: 'all to https'
+      - comment: 'all to https'
         rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^kueche.de$ [NC]'
           - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
         rewrite_rule:
           - '^(.*)$ https://%%{ich-trickse}{SERVER_NAME}$1 [R=301,L]'
-      - index:
-        comment: 'Coremedia Rewrites'
+      - comment: 'Redirects'
+        rewrite_rule:
+          - '^(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE [R=301,L]'
+          - '^/newsletter(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/82/action/newsletter-registration?execution=e1s1 [R=301,L]'
+          - '^/kundenmagazin(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/register-login?&next=order&orderItem=magazine [R=301,L]'
+          - '^/checkliste(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/vorbereitung [R=301,L]'
+          - '^/haendlersuche(/)?$ https://%%{ich-trickse}{SERVER_NAME}/action/de-DE/116/action/vendor-search [R=301,L]'
+          - '^/planungskit(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/register-login?&next=order&orderItem=kit [R=301,L]'
+      - comment: 'Coremedia Rewrites'
         rewrite_rule:
           - '^/login/(.*) /blueprint/servlet/login/$1 [PT,L]'
           - '^/action/(.*) /blueprint/servlet/action/$1 [PT,L]'
@@ -100,12 +108,6 @@ infra::profile::apache::pp_vhosts:
           - '^/de-DE/(.*)$ //blueprint/servlet/page/de-DE/$1 [PT,L]'
           - '^/errors/(.*)$ /var/www/mhk/errors/$1 [L]'
           - '^/assets/(.*)$ /var/www/mhk/errors/assets/$1 [L]'
-          - '^(/)?$ /de-DE [R=301,L]'
-          - '^/newsletter(/)?$ /de-DE/82/action/newsletter-registration?execution=e1s1 [R=301,L]'
-          - '^/kundenmagazin(/)?$ /de-DE/register-login?&next=order&orderItem=magazine [R=301,L]'
-          - '^/checkliste(/)?$ /de-DE/vorbereitung [R=301,L]'
-          - '^/haendlersuche(/)?$ /action/de-DE/116/action/vendor-search [R=301,L]'
-          - '^/planungskit(/)?$ /de-DE/register-login?&next=order&orderItem=kit [R=301,L]'
           - '^/$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/(.*) /blueprint/servlet/page/de-DE/$1 [PT,L]'
     proxy_preserve_host: true

diff --git a/customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml
index d2e1e63878b5148c94a67fba212230d34fbd57b5..9c2b813a0418ae4dd5d459ab92f4ebc31cc3d0bc 100644 (file)
--- a/customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml
@@ -51,27 +51,35 @@ infra::profile::apache::pp_vhosts:
       - www-kueche-de.pixelpark.net
       - www02-mhk-kueche-de.pixelpark.net
     ssl: false
+    directories:
+      - provider: filesmatch
+        path: '\.js$'
+        set_output_filter: 'DEFLATE'
     rewrites:
-      - nonwww:
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(.*)\.kueche\.de$ [NC]'
         rewrite_rule:
           - '^(.*)$ http://kueche.de$1 [R=301,L]'
-      - nonwww2:
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^www-kueche-de\.pixelpark\.net$ [NC]'
           - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
         rewrite_rule:
           - '^(.*)$ https://www-kueche-de.pixelpark.net$1 [R=301,L]'
-      - to_ssl:
-        comment: 'all to https'
+      - comment: 'all to https'
         rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^kueche.de$ [NC]'
           - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
         rewrite_rule:
           - '^(.*)$ https://%%{ich-trickse}{SERVER_NAME}$1 [R=301,L]'
-      - index:
-        comment: 'Coremedia Rewrites'
+      - comment: 'Redirects'
+        rewrite_rule:
+          - '^(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE [R=301,L]'
+          - '^/newsletter(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/82/action/newsletter-registration?execution=e1s1 [R=301,L]'
+          - '^/kundenmagazin(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/register-login?&next=order&orderItem=magazine [R=301,L]'
+          - '^/checkliste(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/vorbereitung [R=301,L]'
+          - '^/haendlersuche(/)?$ https://%%{ich-trickse}{SERVER_NAME}/action/de-DE/116/action/vendor-search [R=301,L]'
+          - '^/planungskit(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/register-login?&next=order&orderItem=kit [R=301,L]'
+      - comment: 'Coremedia Rewrites'
         rewrite_rule:
           - '^/login/(.*) /blueprint/servlet/login/$1 [PT,L]'
           - '^/action/(.*) /blueprint/servlet/action/$1 [PT,L]'
@@ -100,12 +108,6 @@ infra::profile::apache::pp_vhosts:
           - '^/de-DE/(.*)$ //blueprint/servlet/page/de-DE/$1 [PT,L]'
           - '^/errors/(.*)$ /var/www/mhk/errors/$1 [L]'
           - '^/assets/(.*)$ /var/www/mhk/errors/assets/$1 [L]'
-          - '^(/)?$ /de-DE [R=301,L]'
-          - '^/newsletter(/)?$ /de-DE/82/action/newsletter-registration?execution=e1s1 [R=301,L]'
-          - '^/kundenmagazin(/)?$ /de-DE/register-login?&next=order&orderItem=magazine [R=301,L]'
-          - '^/checkliste(/)?$ /de-DE/vorbereitung [R=301,L]'
-          - '^/haendlersuche(/)?$ /action/de-DE/116/action/vendor-search [R=301,L]'
-          - '^/planungskit(/)?$ /de-DE/register-login?&next=order&orderItem=kit [R=301,L]'
           - '^/$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/(.*) /blueprint/servlet/page/de-DE/$1 [PT,L]'
     proxy_preserve_host: true

diff --git a/customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml
index f8376c51e1cc933a5023ea10dae42bc033e059cb..71f08df826ff1942797ea558145551cb8d7aae2a 100644 (file)
--- a/customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml
+++ b/customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml
@@ -51,27 +51,35 @@ infra::profile::apache::pp_vhosts:
       - www-kueche-de.pixelpark.net
       - www03-mhk-kueche-de.pixelpark.net
     ssl: false
+    directories:
+      - provider: filesmatch
+        path: '\.js$'
+        set_output_filter: 'DEFLATE'
     rewrites:
-      - nonwww:
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(.*)\.kueche\.de$ [NC]'
         rewrite_rule:
           - '^(.*)$ http://kueche.de$1 [R=301,L]'
-      - nonwww2:
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^www-kueche-de\.pixelpark\.net$ [NC]'
           - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
         rewrite_rule:
           - '^(.*)$ https://www-kueche-de.pixelpark.net$1 [R=301,L]'
-      - to_ssl:
-        comment: 'all to https'
+      - comment: 'all to https'
         rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^kueche.de$ [NC]'
           - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
         rewrite_rule:
           - '^(.*)$ https://%%{ich-trickse}{SERVER_NAME}$1 [R=301,L]'
-      - index:
-        comment: 'Coremedia Rewrites'
+      - comment: 'Redirects'
+        rewrite_rule:
+          - '^(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE [R=301,L]'
+          - '^/newsletter(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/82/action/newsletter-registration?execution=e1s1 [R=301,L]'
+          - '^/kundenmagazin(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/register-login?&next=order&orderItem=magazine [R=301,L]'
+          - '^/checkliste(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/vorbereitung [R=301,L]'
+          - '^/haendlersuche(/)?$ https://%%{ich-trickse}{SERVER_NAME}/action/de-DE/116/action/vendor-search [R=301,L]'
+          - '^/planungskit(/)?$ https://%%{ich-trickse}{SERVER_NAME}/de-DE/register-login?&next=order&orderItem=kit [R=301,L]'
+      - comment: 'Coremedia Rewrites'
         rewrite_rule:
           - '^/login/(.*) /blueprint/servlet/login/$1 [PT,L]'
           - '^/action/(.*) /blueprint/servlet/action/$1 [PT,L]'
@@ -100,12 +108,6 @@ infra::profile::apache::pp_vhosts:
           - '^/de-DE/(.*)$ //blueprint/servlet/page/de-DE/$1 [PT,L]'
           - '^/errors/(.*)$ /var/www/mhk/errors/$1 [L]'
           - '^/assets/(.*)$ /var/www/mhk/errors/assets/$1 [L]'
-          - '^(/)?$ /de-DE [R=301,L]'
-          - '^/newsletter(/)?$ /de-DE/82/action/newsletter-registration?execution=e1s1 [R=301,L]'
-          - '^/kundenmagazin(/)?$ /de-DE/register-login?&next=order&orderItem=magazine [R=301,L]'
-          - '^/checkliste(/)?$ /de-DE/vorbereitung [R=301,L]'
-          - '^/haendlersuche(/)?$ /action/de-DE/116/action/vendor-search [R=301,L]'
-          - '^/planungskit(/)?$ /de-DE/register-login?&next=order&orderItem=kit [R=301,L]'
           - '^/$ /blueprint/servlet/page/de-DE [PT,L]'
           - '^/(.*) /blueprint/servlet/page/de-DE/$1 [PT,L]'
     proxy_preserve_host: true