From 55075c5ba4b2bfc065d6c6fd3884c7eb87790cde Mon Sep 17 00:00:00 2001 From: sascha Date: Thu, 12 Oct 2017 17:39:35 +0200 Subject: [PATCH] rewrite added on test-redaktion-pfizer PFIZ-5505 --- customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml | 6 ++++++ .../pixelpark-piwik/test-webstats01.pixelpark.net.yaml | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml b/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml index 775334e7..7b19ab9d 100644 --- a/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml +++ b/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml @@ -536,6 +536,12 @@ infra::profile::typo3::projects: # comment: 'https://jira.pixelpark.com/jira/browse/PFIZ-2511' # rewrite_rule: # - ^/services/ueberaktive-blase.htm https://test-www-pfizer-de.pixelpark.net/services.htm [L,R=301] + - PFIZ-5505: + comment: 'https://jira.pixelpark.com/jira/browse/PFIZ-5505' + rewrite_cond: + - '%%{ich-trickse}{HTTP_HOST} ^(test-redaktion-pfizer-de.pixelpark.net)$' + rewrite_rule: + - ^/zwei-magazin-static/zwei-magazin/epaper-zwei_3_Glueck/(.*)$ https://redaktion-pfizer-de.pixelpark.net/zwei-magazin-static/zwei-magazin/epaper-zwei_3_Glueck/$1 [R=301,L] - PFIZ-3871_1: comment: 'https://jira.pixelpark.com/jira/browse/PFIZ-3871' rewrite_cond: diff --git a/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml b/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml index ade9f3f1..581a951a 100644 --- a/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml +++ b/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml @@ -2,7 +2,7 @@ accounts::users: deploy.vogel: apply: true - group: apache + group: nginx infra::role: base infra::additional_classes: @@ -10,6 +10,12 @@ infra::additional_classes: # - infra::profile::mysql_server # - infra::profile::monitoring::mysql +infra::profile::nginx_php_fpm_server::upstream: + 'phpfpm': + ensure: present + members: + - 'localhost:9000' + infra::profile::nginx_php_fpm_server::vhosts: test-webstats01: www_root: '/srv/www/test-webstats01' @@ -18,7 +24,6 @@ infra::profile::nginx_php_fpm_server::vhosts: - 'index.html' server_name: - 'test-webstats01.pixelpark.net' - rewrite_to_https: true ssl: true ssl_cert: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem' -- 2.39.5