From: Thomas Dalichow <thomas.dalichow@publicispixelpark.de>
Date: Wed, 20 Jun 2018 16:29:06 +0000 (+0200)
Subject: Revert "fbb-web - try HTTP-to-HTTPS-redirect in NGINX"
X-Git-Tag: v0.1.0~769
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=32a7af8297855503446fb96b2ae1a3e9f6734f29;p=pixelpark%2Fhiera.git

Revert "fbb-web - try HTTP-to-HTTPS-redirect in NGINX"

This reverts commit 41186d8829d1c203f599c3a0cf4492402bcf0040.
---

diff --git a/customer/fbb-web/test.yaml b/customer/fbb-web/test.yaml
index 3f66240b..cbd0f492 100644
--- a/customer/fbb-web/test.yaml
+++ b/customer/fbb-web/test.yaml
@@ -158,8 +158,6 @@ infra::profile::nginx_php_fpm_server::vhosts:
         - '217.66.56.0/24'
         - '194.174.72.0/21'
       deny: 'all'
-    rewrite_rules:
-      - 'set $do_https_redirect = 0; if ($http_x_forwarded_proto != "https") { set $do_https_redirect = 1; } if ($host = "tst-roadmap.berlin-airport.de") { set $do_https_redirect "${do_https_redirect}1"; } if ($do_https_redirect = 11) { return 301 https://$host$request_uri permanent; }'
   tst-berhub-berlin-airport-de_ssl:
     ensure: present
     www_root: '/srv/www/tst-berhub-berlin-airport-de'