]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
Merge branch 'esysta_live' into 'master'
authorOliver Böttcher <oliver.boettcher@pixelpark.com>
Thu, 3 Mar 2016 09:05:01 +0000 (10:05 +0100)
committerOliver Böttcher <oliver.boettcher@pixelpark.com>
Thu, 3 Mar 2016 09:05:01 +0000 (10:05 +0100)
Esysta: pre-relaunch

See merge request !6

1  2 
customer/emperra/portal-esysta-com.pixelpark.net.yaml

index aa6722a0525272cf4b69b479b02c2ad08b7442ff,f0dbf28b77f4028b3912e00a046c8526cb4fcd71..3519081f154657ba241d3e9b06810dd1c15effb2
@@@ -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