]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
BJES-61 - changed rewrites
authorThomas Heller <thomas.heller@pixelpark.com>
Tue, 5 Jun 2018 13:30:12 +0000 (15:30 +0200)
committerThomas Heller <thomas.heller@pixelpark.com>
Tue, 5 Jun 2018 13:30:12 +0000 (15:30 +0200)
customer/buschjaeger/production.yaml

index fac6449ac07217fcbb24359105ed469b2d21a5d4..060af22c432481530b8ed35937f0b424296153ca 100644 (file)
@@ -165,50 +165,37 @@ infra::profile::typo3::projects:
       - comment: Startseiten
       - 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:
-          - '%%{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:
           - '%%{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:
+          - '%%{ich-trickse}{HTTP_HOST} ^(www\.busch-jaeger\.com|busch-jaeger\.com|www\.busch-jaeger\.uk|busch-jaeger\.uk)$'
+        rewrite_rule:
+          - '^(.*)$ https://www.busch-jaeger.de/en/$1 [R=301,L]'
       - 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:
           - '%%{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:
           - '%%{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:
           - '%%{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:
           - '%%{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]'
-      - 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]'
       - comment: redirects
         rewrite_rule:
           - '^/de/service.htm https://www.busch-jaeger.de/de/service-tools/ [R=301,L]'