From: Oliver Böttcher Date: Tue, 4 Jul 2017 12:05:47 +0000 (+0200) Subject: ODT - fix int rewrites X-Git-Tag: v0.1.0~2728 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=14a472a369391c1dbe7f18b085130d1cee4c737f;p=pixelpark%2Fhiera.git ODT - fix int rewrites --- diff --git a/customer/mbvd-odt/int-cms-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/int-cms-odt-daimler-com.pixelpark.net.yaml index b5e1d514..bcf73746 100644 --- a/customer/mbvd-odt/int-cms-odt-daimler-com.pixelpark.net.yaml +++ b/customer/mbvd-odt/int-cms-odt-daimler-com.pixelpark.net.yaml @@ -38,7 +38,10 @@ infra::profile::apache::pp_vhosts: - https: comment: 'all to https' rewrite_rule: - - '^(.*)$ https://int-cms-odt-daimler-com.pixelpark.net$1 [L,R=301]' + - '^/system/(.*)$ https://int-cms-odt-daimler-com.pixelpark.net/system/$1 [L,R=301]' + - login: + rewrite_rule: + - '^(/)?$ https://int-cms-odt-daimler-com.pixelpark.net/system/login [L,R=301]' - proxy_non_https: rewrite_cond: - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)' @@ -82,10 +85,11 @@ infra::profile::apache::pp_vhosts: rewrite_rule: - '^/opencms/(.*)$ /$1 [R,L]' rewrites_non_ssl: - - https: - comment: 'all to https' + - https_forms: + rewrite_cond: + - '%%{ich-trickse}{REQUEST_URI} ^/(r/|w/|anmeldung|forms_retail|forms_wholesale) [NC]' rewrite_rule: - - '^(.*)$ https://int-cms-odt-daimler-com.pixelpark.net$1 [L,R=301]' + - '^(.*)$ https://int-newsletter-mercedes-benz-de.pixelpark.net$1 [R=301,L,QSA,NE]' - proxy_non_https: rewrite_cond: - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)' @@ -129,10 +133,11 @@ infra::profile::apache::pp_vhosts: rewrite_rule: - '^/opencms/(.*)$ /$1 [R,L]' rewrites_non_ssl: - - https: - comment: 'all to https' + - https_forms: + rewrite_cond: + - '%%{ich-trickse}{REQUEST_URI} ^/(r/|w/|anmeldung|forms_retail|forms_wholesale) [NC]' rewrite_rule: - - '^(.*)$ https://int-cms-odt-daimler-com.pixelpark.net$1 [L,R=301]' + - '^(.*)$ https://int-newsletter-smart-de.pixelpark.net$1 [R=301,L,QSA,NE]' - proxy_non_https: rewrite_cond: - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)' @@ -176,10 +181,11 @@ infra::profile::apache::pp_vhosts: rewrite_rule: - '^/opencms/(.*)$ /$1 [R,L]' rewrites_non_ssl: - - https: - comment: 'all to https' + - https_forms: + rewrite_cond: + - '%%{ich-trickse}{REQUEST_URI} ^/(r/|w/|anmeldung|forms_retail|forms_wholesale) [NC]' rewrite_rule: - - '^(.*)$ https://int-cms-odt-daimler-com.pixelpark.net$1 [L,R=301]' + - '^(.*)$ https://int-newsletter-truckworks-de.pixelpark.net$1 [R=301,L,QSA,NE]' - proxy_non_https: rewrite_cond: - '%%{ich-trickse}{REQUEST_URI} !^/(opencms|resources|export|skins|genImages|genImagesTemp|fonts)' @@ -211,7 +217,7 @@ infra::profile::apache::pp_vhosts: docroot: /var/www/html ssl: true cert_servername: 'wildcard.pixelpark.net' - cert_customer: 'pixelpark' + cert_customer: 'pixelpark' ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem' ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'