From a2889cf3785e0bd41cbb931e82fb294bffc8a014 Mon Sep 17 00:00:00 2001 From: Andreas Gerstenberg Date: Mon, 8 Jan 2018 14:28:28 +0100 Subject: [PATCH] spk-spar-checker rewrite remove literal --- customer/spk-spar-checker/test.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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]' -- 2.39.5