MBVD Topdeal, SSL & Rewrites

diff --git a/customer/mbvd-transporter-topdeal/www-mbvd-transporter-topdeal-de.pixelpark.net.yaml b/customer/mbvd-transporter-topdeal/www-mbvd-transporter-topdeal-de.pixelpark.net.yaml
index 5b4430cefe646996ab9d4711527d6f25cfef6894..a11b7e03d03ad272cabce067ff02acc96a511ea5 100644 (file)
--- a/customer/mbvd-transporter-topdeal/www-mbvd-transporter-topdeal-de.pixelpark.net.yaml
+++ b/customer/mbvd-transporter-topdeal/www-mbvd-transporter-topdeal-de.pixelpark.net.yaml
@@ -12,13 +12,6 @@ site::profile::ruby_passenger::projects:
     serveraliases:
       - transporter-topdeal.de
       - www-mbvd-transporter-topdeal-de.pixelpark.net
-    rewrites:
-      - alias:
-        comment: 'Weiterleitung auf mercedes-benz.de'
-        rewrite_cond:
-          - '%%{ich-trickse}{HTTP_HOST} !^(www\.)?transporter-topdeal\.de$ [NC]'
-        rewrite_rule:
-          - '^(.*)$ http://www.transporter-topdeal.de$1 [L,R=301]'
     ssl_cert: '/etc/pki/tls/certs/www.transporter-topdeal.de-cert.pem'
     ssl_key: '/etc/pki/tls/private/www.transporter-topdeal.de-key.pem'
     ssl_chain: '/etc/pki/tls/certs/www.transporter-topdeal.de-cert.pem'
@@ -37,3 +30,20 @@ site::profile::ruby_passenger::projects:
         allow_override:
           - None
         directoryindex: index.html
+
+    rewrites:
+      - alias:
+        comment: 'Weiterleitung auf www'
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP_HOST} !^www\.transporter-topdeal\.de$ [NC]'
+        rewrite_rule:
+          - '^(.*)$ https://www.transporter-topdeal.de$1 [L,R=301]'
+      - alias1:
+        comment: 'Weiterleitung auf https'
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
+        rewrite_rule:
+          - '^(.*)$ https://www.transporter-topdeal.de$1 [L,R=301]'
+    setenvif_ssl:
+      - 'HTTPS on HTTPS=on'
+    access_log_format: urchinpp_xf4