From: Andreas Gerstenberg <gerstenberg@pixelpark.com>
Date: Wed, 12 Apr 2017 14:59:58 +0000 (+0200)
Subject: marketing-publicis-ai fancy rebuild
X-Git-Tag: v0.1.0~3173
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=51d38bfbc1adbd15749423306429613fa87782d7;p=pixelpark%2Fhiera.git

marketing-publicis-ai fancy rebuild
---

diff --git a/customer/pixelpark/marketing-publicis-ai.pixelpark.net.yaml b/customer/pixelpark/marketing-publicis-ai.pixelpark.net.yaml
index 835337cc..8f3e81bc 100644
--- a/customer/pixelpark/marketing-publicis-ai.pixelpark.net.yaml
+++ b/customer/pixelpark/marketing-publicis-ai.pixelpark.net.yaml
@@ -119,14 +119,15 @@ infra::profile::apache::pp_vhosts:
 #        require: 'ip 217.66.51.0/24'
 #        require: 'ip 217.66.56.0/24'
 
+    setenv:
+      - 'MAUTIC_ENV live'
     setenvif:
       - 'Remote_Addr ^217\.66\.49\. mautic_access=true'
       - 'Remote_Addr ^217\.66\.50\. mautic_access=true'
       - 'Remote_Addr ^217\.66\.51\. mautic_access=true'
       - 'Remote_Addr ^217\.66\.56\. mautic_access=true'
-
-    setenv:
-      - 'MAUTIC_ENV live'
+    setenvif_ssl:
+      - 'HTTPS on HTTPS=on'
     rewrites:
       - alias:
         comment: 'Weiterleitung auf https'
@@ -141,8 +142,6 @@ infra::profile::apache::pp_vhosts:
           - '%%{ich-trickse}{REQUEST_URI} ^/s/login'
         rewrite_rule:
           - '^(.*)$ https://campaign.pepperl-fuchs.de/feldbusmodule [R=301,L]'
-    setenvif_ssl:
-      - 'HTTPS on HTTPS=on'
 
 infra::profile::cron::cronjobs:
   mautic_update: