From: Oliver Böttcher <oliver.boettcher@pixelpark.com>
Date: Thu, 3 Mar 2016 09:05:01 +0000 (+0100)
Subject: Merge branch 'esysta_live' into 'master'
X-Git-Tag: v0.1.0~5240
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=90f16240369723d8559346d14ad9f1f214f8797b;p=pixelpark%2Fhiera.git

Merge branch 'esysta_live' into 'master'

Esysta: pre-relaunch

See merge request !6
---

90f16240369723d8559346d14ad9f1f214f8797b
diff --cc customer/emperra/portal-esysta-com.pixelpark.net.yaml
index aa6722a0,f0dbf28b..3519081f
--- a/customer/emperra/portal-esysta-com.pixelpark.net.yaml
+++ b/customer/emperra/portal-esysta-com.pixelpark.net.yaml
@@@ -352,8 -332,12 +352,13 @@@ site::profile::apache::vhosts
            - MultiViews
          allow_override:
            - All
+       - slash:
+         provider: location
+         path: '/'
+         require:
+           - "ip 87.139.254.133 212.204.54.54 80.87.117.30"
      wsgi_daemon_process: mitarbeiter
 +    wsgi_pass_authorization: 'on'
      wsgi_daemon_process_options:
        processes: 2
        threads: 15