]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
MHK - fix rewrite rules
authorOliver Böttcher <oliver.boettcher@pixelpark.com>
Thu, 30 Mar 2017 11:44:24 +0000 (13:44 +0200)
committerOliver Böttcher <oliver.boettcher@pixelpark.com>
Thu, 30 Mar 2017 11:44:24 +0000 (13:44 +0200)
customer/mhk/www01-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/www02-mhk-kueche-de.pixelpark.net.yaml
customer/mhk/www03-mhk-kueche-de.pixelpark.net.yaml

index ad9a7950f85bd4da3aee2b7864a6e4df58da27ae..150fe12249f068d6d05396660407ed8ece521165 100644 (file)
@@ -78,6 +78,7 @@ site::profile::apache::pp_vhosts:
       - nonwww2:
         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:
index 3e05105831f3814f3f652ea9ac3eb8d54857855c..abb14ab013ab1aa9c4cef2ca45c9ce9e1d8cd9ab 100644 (file)
@@ -69,6 +69,7 @@ site::profile::apache::pp_vhosts:
       - nonwww2:
         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:
index 21d0f821bb0ea208d27e9a32b8b058699dfffdd9..4616a79490a7f4e3caa7a08dbb4b13a17b604890 100644 (file)
@@ -69,6 +69,7 @@ site::profile::apache::pp_vhosts:
       - nonwww2:
         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: