From: Andreas Gerstenberg <gerstenberg@pixelpark.com>
Date: Mon, 8 Jan 2018 13:28:28 +0000 (+0100)
Subject: spk-spar-checker rewrite remove literal
X-Git-Tag: v0.1.0~1807
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a2889cf3785e0bd41cbb931e82fb294bffc8a014;p=pixelpark%2Fhiera.git

spk-spar-checker rewrite remove literal
---

diff --git a/customer/spk-spar-checker/test.yaml b/customer/spk-spar-checker/test.yaml
index 1a16d7c3..097eff41 100644
--- a/customer/spk-spar-checker/test.yaml
+++ b/customer/spk-spar-checker/test.yaml
@@ -10,7 +10,7 @@ infra::additional_classes:
 # mysql::server::config_file: "/etc/my.cnf"             # required forproper MySQL installation
 
 apache::log_formats:
-  spk_combined: '%{literal('%')}{X-Forwarded-For}i %a %l %u %t \"%r\" %>s %b \"%{literal('%')}{Referer}i\" \"%{literal('%')}{User-Agent}i\"'
+  spk_combined: '%%{ich-trickse}{X-Forwarded-For}i %a %l %u %t \"%r\" %>s %b \"%%{ich-trickse}{Referer}i\" \"%%{ich-trickse}{User-Agent}i\"'
 
 mysql::server::users:
   'replication@%':
@@ -135,7 +135,7 @@ infra::profile::apache::pp_vhosts:
         rewrites:
           - comment: 'frontend root rewrite'
             rewrite_cond:
-              - '%{literal('%')}{REQUEST_URI} ^/$'
+              - '%%{ich-trickse}{REQUEST_URI} ^/$'
             rewrite_rule:
               - '.* /index.html [END]'
           - comment: 'frontend rewrites'
@@ -227,12 +227,12 @@ infra::profile::apache::pp_vhosts:
     rewrites:
       - comment: 'http to https'
         rewrite_cond:
-          - '%{literal('%')}{HTTP:HTTPS} !=on'
+          - '%%{ich-trickse}{HTTP:HTTPS} !=on'
         rewrite_rule:
           - '^(.*)$ https://stage-spar-checker-de.pixelpark.net$1 [R=301,L]'
       - comment: 'Alle Aliase auf Servername'
         rewrite_cond:
-          - '%{literal('%')}{HTTP_HOST} !^stage-spar-checker-de.pixelpark.net$ [NC]'
+          - '%%{ich-trickse}{HTTP_HOST} !^stage-spar-checker-de.pixelpark.net$ [NC]'
         rewrite_rule:
           - '^(.*)$ https://stage-spar-checker-de.pixelpark.net$1 [R=301,L]'