]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
marketing-publicis-ai fancy rebuild
authorAndreas Gerstenberg <gerstenberg@pixelpark.com>
Wed, 12 Apr 2017 14:59:58 +0000 (16:59 +0200)
committerAndreas Gerstenberg <gerstenberg@pixelpark.com>
Wed, 12 Apr 2017 14:59:58 +0000 (16:59 +0200)
customer/pixelpark/marketing-publicis-ai.pixelpark.net.yaml

index 835337ccd04b64553cb1245c9cba258056228ad0..8f3e81bc9a534f8452a30a0ffff63adccf768430 100644 (file)
@@ -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: