]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
rewrite added on test-redaktion-pfizer PFIZ-5505
authorsascha <sascha@knecht.pixelpark.com>
Thu, 12 Oct 2017 15:39:35 +0000 (17:39 +0200)
committersascha <sascha@knecht.pixelpark.com>
Thu, 12 Oct 2017 15:39:35 +0000 (17:39 +0200)
customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml
customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml

index 775334e769871060ea35c4c0c7693c4ba3e04e4f..7b19ab9db37ead57abf3d5ff75bec12e5df875bf 100644 (file)
@@ -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:
index ade9f3f18a24bfdf5f6126c6380dcffef8dff9a0..581a951ae03b36ab75c85382fdb1c06b483841d5 100644 (file)
@@ -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'