]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
projects / pixelpark / hiera.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d555e12)
Correct test rheuma psoriasis
authorPhilipp Dallig <philipp.dallig@pixelpark.com>
Thu, 10 Mar 2016 14:26:33 +0000 (15:26 +0100)
committerPhilipp Dallig <philipp.dallig@pixelpark.com>
Thu, 10 Mar 2016 14:26:33 +0000 (15:26 +0100)
customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml patch | blob | history

diff --git a/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml b/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml
index d9da2f20b1cb4b964d198ec69b498fa8dc0a0874..682e75db2f2a46398cee10e2d1da6406df965e4b 100644 (file)
--- a/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml
+++ b/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml
@@ -854,7 +854,6 @@ site::profile::apache::vhosts:
     docroot: '/srv/www/test-www.wegweiser-rheuma-psoriasis.de/current'
     manage_docroot: false
     port: 80
-    directoryindex: rheuma.html
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '0770'
@@ -867,6 +866,7 @@ site::profile::apache::vhosts:
           - MultiViews
         allow_override:
           - All
+        directoryindex: rheuma.html
       - location_root:
         provider: location
         path: '/'
@@ -878,13 +878,13 @@ site::profile::apache::vhosts:
         auth_require: 'valid-user'
         require:
           - 'ip 217.66.55 217.66.50 217.66.51 217.66.48.130 168.224.160 10.121.101 204.114.176 204.114.216 148.168.40 202.32.173 204.114.248 168.224.1 168.224.160 148.168.127 204.114.196 193.235.226 212.58.14 204.114.199 155.94.99 155.94.78 155.94.62 218.213.241 155.94.70 155.94.110 222.73.72 155.94.119 155.94.55 68.58.141.20 174.137.32.22 15.213.17 85.183.14'
-#    rewrites:
-#      - rheuma:
-#        comment: 'Redirect to rheuma domain'
-#        rewrite_cond:
-#          - '%%{ich-trickse}{REQUEST_URI} ^/rheuma.html$'
-#        rewrite_rule:
-#          - ^(/rheuma.html)$ http://test-www-wegweiser-rheuma-de.pixelpark.net$1 [R=301,L]
+    rewrites:
+      - rheuma:
+        comment: 'Redirect to rheuma domain'
+        rewrite_cond:
+          - '%%{ich-trickse}{REQUEST_URI} ^/rheuma.html$'
+        rewrite_rule:
+          - ^(/rheuma.html)$ http://test-www-wegweiser-rheuma-de.pixelpark.net$1 [R=301,L]
 
   wegweiser-rheuma_ssl:
     servername: test-www-wegweiser-rheuma-de.pixelpark.net
@@ -898,7 +898,6 @@ site::profile::apache::vhosts:
     ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem
-    directoryindex: rheuma.html
     directories:
       - directory_root:
         provider: directory
@@ -908,6 +907,7 @@ site::profile::apache::vhosts:
           - MultiViews
         allow_override:
           - All
+        directoryindex: rheuma.html
       - location_root:
         provider: location
         path: '/'
@@ -919,13 +919,13 @@ site::profile::apache::vhosts:
         auth_require: 'valid-user'
         require:
           - 'ip 217.66.55 217.66.50 217.66.51 217.66.48.130 168.224.160 10.121.101 204.114.176 204.114.216 148.168.40 202.32.173 204.114.248 168.224.1 168.224.160 148.168.127 204.114.196 193.235.226 212.58.14 204.114.199 155.94.99 155.94.78 155.94.62 218.213.241 155.94.70 155.94.110 222.73.72 155.94.119 155.94.55 68.58.141.20 174.137.32.22 15.213.17 85.183.14'
-#    rewrites:
-#      - rheuma:
-#        comment: 'Redirect to rheuma domain'
-#        rewrite_cond:
-#          - '%%{ich-trickse}{REQUEST_URI} ^/rheuma.html$'
-#        rewrite_rule:
-#          - ^(/rheuma.html)$ https://test-www-wegweiser-rheuma-de.pixelpark.net$1 [R=301,L]
+    rewrites:
+      - rheuma:
+        comment: 'Redirect to rheuma domain'
+        rewrite_cond:
+          - '%%{ich-trickse}{REQUEST_URI} ^/rheuma.html$'
+        rewrite_rule:
+          - ^/rheuma.html$ https://test-www-wegweiser-rheuma-de.pixelpark.net$1 [R=301,L]
 
   wegweiser-psoriasis:
     servername: test-www-wegweiser-psoriasis-de.pixelpark.net
@@ -935,7 +935,6 @@ site::profile::apache::vhosts:
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '0770'
-    directoryindex: psoriasis.html
     directories:
       - directory_root:
         provider: directory
@@ -945,6 +944,7 @@ site::profile::apache::vhosts:
           - MultiViews
         allow_override:
           - All
+        directoryindex: psoriasis.html
       - location_root:
         provider: location
         path: '/'
@@ -956,13 +956,13 @@ site::profile::apache::vhosts:
         auth_require: 'valid-user'
         require:
           - 'ip 217.66.55 217.66.50 217.66.51 217.66.48.130 168.224.160 10.121.101 204.114.176 204.114.216 148.168.40 202.32.173 204.114.248 168.224.1 168.224.160 148.168.127 204.114.196 193.235.226 212.58.14 204.114.199 155.94.99 155.94.78 155.94.62 218.213.241 155.94.70 155.94.110 222.73.72 155.94.119 155.94.55 68.58.141.20 174.137.32.22 15.213.17 85.183.14'
-#    rewrites:
-#      - rheuma:
-#        comment: 'Redirect to rheuma domain'
-#        rewrite_cond:
-#          - '%%{ich-trickse}{REQUEST_URI} ^/psoriasis.html'
-#        rewrite_rule:
-#          - ^(/psoriasis.html)$ http://test-www-wegweiser-psoriasis-de.pixelpark.net$1 [R=301,L]
+    rewrites:
+      - rheuma:
+        comment: 'Redirect to rheuma domain'
+        rewrite_cond:
+          - '%%{ich-trickse}{REQUEST_URI} ^/psoriasis.html'
+        rewrite_rule:
+          - ^/psoriasis.html$ http://test-www-wegweiser-psoriasis-de.pixelpark.net$1 [R=301,L]
   wegweiser-psoriasis_ssl:
     servername: test-www-wegweiser-psoriasis-de.pixelpark.net
     docroot: '/srv/www/test-www.wegweiser-rheuma-psoriasis.de/current'
@@ -975,7 +975,6 @@ site::profile::apache::vhosts:
     ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem
-    directoryindex: psoriasis.html
     directories:
       - directory_root:
         provider: directory
@@ -985,6 +984,7 @@ site::profile::apache::vhosts:
           - MultiViews
         allow_override:
           - All
+        directoryindex: psoriasis.html
       - location_root:
         provider: location
         path: '/'
@@ -996,13 +996,13 @@ site::profile::apache::vhosts:
         auth_require: 'valid-user'
         require:
           - 'ip 217.66.55 217.66.50 217.66.51 217.66.48.130 168.224.160 10.121.101 204.114.176 204.114.216 148.168.40 202.32.173 204.114.248 168.224.1 168.224.160 148.168.127 204.114.196 193.235.226 212.58.14 204.114.199 155.94.99 155.94.78 155.94.62 218.213.241 155.94.70 155.94.110 222.73.72 155.94.119 155.94.55 68.58.141.20 174.137.32.22 15.213.17 85.183.14'
-#    rewrites:
-#      - rheuma:
-#        comment: 'Redirect to rheuma domain'
-#        rewrite_cond:
-#          - '%%{ich-trickse}{REQUEST_URI} ^/psoriasis.html'
-#        rewrite_rule:
-#          - ^(/psoriasis.html)$ http://test-www-wegweiser-psoriasis-de.pixelpark.net$1 [R=301,L]
+    rewrites:
+      - rheuma:
+        comment: 'Redirect to rheuma domain'
+        rewrite_cond:
+          - '%%{ich-trickse}{REQUEST_URI} ^/psoriasis.html'
+        rewrite_rule:
+          - ^/psoriasis.html$ http://test-www-wegweiser-psoriasis-de.pixelpark.net$1 [R=301,L]
           
   static.pfizer:
     servername: test-static-pfizer-de.pixelpark.net
Unnamed repository; edit this file 'description' to name the repository.