From 3d394c8b9b4aa0d392cdbf28c768d23427994614 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Oliver=20B=C3=B6ttcher?= Date: Tue, 25 Apr 2017 11:52:30 +0200 Subject: [PATCH] MHK - compress js --- .../www01-mhk-kueche-de.pixelpark.net.yaml | 30 ++++++++++--------- .../www02-mhk-kueche-de.pixelpark.net.yaml | 30 ++++++++++--------- .../www03-mhk-kueche-de.pixelpark.net.yaml | 30 ++++++++++--------- 3 files changed, 48 insertions(+), 42 deletions(-) diff --git a/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml b/customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml index 57dad1c0..a8f8033c 100644 --- 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 d2e1e638..9c2b813a 100644 --- 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 f8376c51..71f08df8 100644 --- 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 -- 2.39.5