From: Andreas Gerstenberg <gerstenberg@pixelpark.com>
Date: Thu, 19 Jul 2018 10:06:15 +0000 (+0200)
Subject: pixelpark update config test-confluence01.pixelpark.net
X-Git-Tag: v0.1.0~562
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=0a73e837996a66e0fa2f13d0b5a195421e2b4945;p=pixelpark%2Fhiera.git

pixelpark update config test-confluence01.pixelpark.net
---

diff --git a/customer/pixelpark/test-confluence01.pixelpark.net.yaml b/customer/pixelpark/test-confluence01.pixelpark.net.yaml
index c71e9557..8fed6a97 100644
--- a/customer/pixelpark/test-confluence01.pixelpark.net.yaml
+++ b/customer/pixelpark/test-confluence01.pixelpark.net.yaml
@@ -36,6 +36,20 @@ infra::profile::apache::pp_vhosts:
         allow_override:
           - All
         directoryindex: index.html
+
+      - provider: location
+        path: '/confluence'
+
+      - provider: location
+        path: '/synchrony'
+        rewrites:
+        - comment: 'synchrony'
+          rewrite_cond:
+            - '%{literal("%")}{HTTP:UPGRADE} ^WebSocket$ [NC]'
+            - '%{literal("%")}{HTTP:CONNECTION} Upgrade$ [NC]'
+          rewrite_rule:
+            - .* ws://test-confluence01.pixelpark.net:8091%{REQUEST_URI} [P]
+
     proxy_pass:
       - { path: /server-status, url: '!' }
       - { path: /server-info, url: '!' }
@@ -47,16 +61,11 @@ infra::profile::apache::pp_vhosts:
     rewrites:
       - comment: 'switch to https'
         rewrite_cond:
-          - '%%{ich-trickse}{HTTPS} !=on [NC]'
+#          - '%%{ich-trickse}{HTTPS} !=on [NC]'
+          - '%{literal("%")}{HTTPS} !=on [NC]'
         rewrite_rule:
-          - ^(.*)$ https://%%{ich-trickse}{HTTP_HOST}$1 [R=301,L]
+#          - ^(.*)$ https://%%{ich-trickse}{HTTP_HOST}$1 [R=301,L]
+          - ^(.*)$ https://%{literal("%")}{HTTP_HOST}$1 [R=301,L]
       - comment: 'Rewrite from / to /confluence'
         rewrite_rule:
           - ^(/?)$ /confluence/ [R=301,L]
-      - comment: 'synchrony'
-        rewrite_cond:
-          - '%HTTP:UPGRADE} ^WebSocket$ [NC]'
-          - '%{HTTP:CONNECTION} Upgrade$ [NC]'
-      - comment: 'synchrony die zweite'
-        rewrite_rule:
-          - .* ws://test-confluence01.pixelpark.net:8091%{REQUEST_URI} [P]
\ No newline at end of file