]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
Revert "added rewrites to new env"
authorThomas Heller <thomas.heller@pixelpark.com>
Fri, 19 Jan 2018 11:08:58 +0000 (12:08 +0100)
committerThomas Heller <thomas.heller@pixelpark.com>
Fri, 19 Jan 2018 11:08:58 +0000 (12:08 +0100)
This reverts commit c5e2fce6fb9869fafea4144768c4d71e52a7328c.

customer/buschjaeger/production.yaml

index dded67487d014c842a1f4f11bd37649fd69d40c2..da2fa1e8a4508b7460050ea3c066105674db59e0 100644 (file)
@@ -25,6 +25,7 @@ solr::cores:
   polish: {}
   russian: {}
 
+
 apache::default_vhost: false
 apache::mod::remoteip::proxy_ips:
   - '93.188.107.189'
@@ -89,116 +90,115 @@ infra::profile::typo3::projects:
       - web01-buschjaeger-de.pixelpark.net
       - web02-buschjaeger-de.pixelpark.net
     rewrites:
-        comment: freeathome DE
+      - comment: freeathome DE
         rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.de|busch-jaeger\.de)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/freeathome$ [OR]'
           - '%%{ich-trickse}{REQUEST_URI} ^/freeathome2$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/produkte/systeme/busch-free-at-home/ [R=301,L]'
-        comment: freeathome EN
+      - comment: freeathome EN
         rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.com|busch-jaeger\.com)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/freeathome$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/en/products/systems/abb-freehome/ [R=301,L]'
-        comment: freeathome NL
+      - comment: freeathome NL
         rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.nl|busch-jaeger\.nl)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/freeathome$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/nl/producten/systemen/busch-freehome/ [R=301,L]'
-        comment: freeathome AT
+      - comment: freeathome AT
         rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.at|busch-jaeger\.at)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/freeathome$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/at/produkte/systeme/busch-free-at-home/ [R=301,L]'
-        comment: DE
+      - comment: DE
         rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.de|busch-jaeger\.de)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/stammdaten(/?)$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/service-tools/downloads/stammdaten/ [R=301,L]'
-        comment: NL
+      - comment: NL
         rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.nl|busch-jaeger\.nl)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/lse$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/nl/planning-en-uitvoering/living-space-experience [R=301,L]'
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.nl|busch-jaeger\.nl)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/actie$'
         rewrite_rule:
           - '^(.*)$ https://busch-jaeger.responsemanager.eu/nl_nl/1001042 [R=301,L]'
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.nl|busch-jaeger\.nl)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/usb$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/de/produkte/produktloesungen/steckdosen/schukor-usb-steckdose/ [R=301,L]'
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-balancesi.nl|busch-balancesi.nl)$'
-        rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/nl/producten/schakelaarprogrammas/busch-balance-si/ [R=301,L]'
-        comment: AT
+      - comment: AT
         rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.at|busch-jaeger\.at)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/reg-led-dimmer$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/at/produkte/produktloesungen/dimmer/reg-led-dimmer/ [R=301,L]'
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.at|busch-jaeger\.at)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/rauchmelder$'
         rewrite_rule:
           - '^(.*)$  https://www.busch-jaeger.de/at/produkte/produktloesungen/rauchmelderwaermemelder/ [R=301,L]'
-        comment: Startseiten
+      - comment: Startseiten
         rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.de|busch-jaeger\.de)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/de/index.htm$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de$1 [R=301,L]'
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.at|busch-jaeger\.at)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/at/index.htm$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/at/$1 [R=301,L]'
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.com|busch-jaeger\.com|www\.busch-jaeger\.uk|busch-jaeger\.uk)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/en/index.htm$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/en/$1 [R=301,L]'
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.com|busch-jaeger\.com)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/pl/index.htm$ [OR]'
           - '%%{ich-trickse}{REQUEST_URI} ^/pl(\/?)$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/pl/ [R=301,L]'
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.nl|busch-jaeger\.nl)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/nl/index.htm$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/nl/$1 [R=301,L]'
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.fr|busch-jaeger\.fr)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/fr/index.htm$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/fr/$1 [R=301,L]'
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.pl|busch-jaeger\.pl)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/pl/index.htm$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/pl/$1 [R=301,L]'
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.ru|busch-jaeger\.ru)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/ru/index.htm$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/ru/$1 [R=301,L]'
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.it|busch-jaeger\.it)$'
           - '%%{ich-trickse}{REQUEST_URI} ^/it/index.htm$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/it/$1 [R=301,L]'
-        comment: redirects
+      - comment: redirects
         rewrite_rule:
           - '^/de/service.htm https://www.busch-jaeger.de/de/service-tools/ [R=301,L]'
           - '^/bj_ar_motiv_k3g_en.pdf https://www.busch-jaeger.de/fileadmin/de.buschjaeger/content_de/content/pdfs/Tracking_Motiv_Welcome-3D_App.pdf [R=301,L]'
@@ -366,11 +366,11 @@ infra::profile::typo3::projects:
           - '^/de/elektrofachbetriebe/5433.htm https://www.busch-jaeger.de/de/service-tools/seminare/inhouse-seminare/zertifizierung-zur-fachkraft-fuer-rauchwarnmelder-nach-din-14676/ [R=301,L]'
           - '^/de/pdf/Tracking_Motiv_Welcome-3D_App.pdf https://www.busch-jaeger.de/fileadmin/de.buschjaeger/content_de/content/pdfs/Tracking_Motiv_Welcome-3D_App.pdf [R=301,L]'
           - '^/de/service/fachhaendlersuche.htm https://www.busch-jaeger.de/de/service-tools/fachhaendlersuche/#fhs-karte [L,NE,R=302]'
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.it|busch-jaeger\.it)$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/at/$1 [R=301,L]'
-        rewrite_cond:
+      - rewrite_cond:
           - '%%{ich-trickse}{REQUEST_URI} ^/typo3$'
         rewrite_rule:
           - '^(.*)$ https://www.busch-jaeger.de/typo3/ [R=301,L]'