pfizer - some more cleanup on dev

diff --git a/customer/pfizer/dev-web01-pfizer-de.pixelpark.net.yaml b/customer/pfizer/dev-web01-pfizer-de.pixelpark.net.yaml
index ad9af9c1fc77bbd5f63b3ac957fb5ef401f037ca..26f700de8d0549f36f43e445d8004a5b7235fa69 100644 (file)
--- a/customer/pfizer/dev-web01-pfizer-de.pixelpark.net.yaml
+++ b/customer/pfizer/dev-web01-pfizer-de.pixelpark.net.yaml
@@ -533,7 +533,7 @@ site::profile::typo3::projects:
 
 site::profile::apache::pp_vhosts:
   dev-pfizer-berlin:
-    servername: dev-www-pfizer-berlin.pixelpark.net
+    servername: dev-www-pfizer-berlin.pixelpark.net # CName auf dev-web01-pfizer-de.pixelpark.net.
     docroot: '/srv/www/mspfizerberlin'
     ssl: false
     docroot_owner: apache
@@ -566,7 +566,7 @@ site::profile::apache::pp_vhosts:
           - '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'
 
   dev-ich-beim-arzt:
-    servername: dev-ich-beim-arzt-de.pixelpark.net
+    servername: dev-ich-beim-arzt-de.pixelpark.net # CName auf dev-web01-pfizer-de.pixelpark.net.
     docroot: '/srv/www/dev-www.ich-beim-arzt.de'
     ssl: false
     docroot_owner: apache
@@ -599,7 +599,7 @@ site::profile::apache::pp_vhosts:
           - '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'
 
   dev-lungenkrebs-testen-at:
-    servername: dev-www-lungenkrebs-testen-at.pixelpark.net
+    servername: dev-www-lungenkrebs-testen-at.pixelpark.net # CName auf dev-web01-pfizer-de.pixelpark.net.
     docroot: '/srv/www/dev-www.lungenkrebs-testen.at'
     ssl: false
     docroot_owner: apache
@@ -632,7 +632,7 @@ site::profile::apache::pp_vhosts:
           - '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'
 
   dev-lungenkrebs-testen-de:
-    servername: dev-www-lungenkrebs-testen-de.pixelpark.net
+    servername: dev-www-lungenkrebs-testen-de.pixelpark.net # CName auf dev-web01-pfizer-de.pixelpark.net.
     docroot: '/srv/www/dev-www.lungenkrebs-testen.de'
     docroot_owner: apache
     docroot_group: apache
@@ -666,16 +666,7 @@ site::profile::apache::pp_vhosts:
         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'
   dev-impf2ab60:
-    servername: dev-www-impf2ab60-de.pixelpark.net
-    serveraliases:
-      - dev-www-impf2-de.pixelpark.net
-      - dev-www-impf2ab60-de.pixelpark.net
-      - dev-www-impfzweiab60-de.pixelpark.net
-      - dev-www-impf2absechzig-de.pixelpark.net
-      - dev-www-impfzweiabsechzig-de.pixelpark.net
-      - dev-www-impf-zwei-ab-sechzig-de.pixelpark.net
-      - dev-www-impf-2-ab-60-de.pixelpark.net
-      - dev-www-impf2-ab-60-de.pixelpark.net
+    servername: dev-www-impf2ab60-de.pixelpark.net # CName auf dev-web01-pfizer-de.pixelpark.net.
     docroot: '/srv/www/dev-www.impf2ab60.de'
     ssl: false
     docroot_owner: apache
@@ -708,7 +699,7 @@ site::profile::apache::pp_vhosts:
           - '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'
 
   dev-wegweiser-rheuma-psoriasis:
-    servername: dev-www-wegweiser-rheuma-psoriasis-de.pixelpark.net
+    servername: dev-www-wegweiser-rheuma-psoriasis-de.pixelpark.net # CName auf dev-web01-pfizer-de.pixelpark.net.
     docroot: '/srv/www/dev-www.wegweiser-rheuma-psoriasis.de/current'
     manage_docroot: false
     docroot_owner: apache
@@ -757,7 +748,7 @@ site::profile::apache::pp_vhosts:
         rewrite_rule:
           - ^/psoriasis.html$ https://dev-www-wegweiser-psoriasis-de.pixelpark.net [R=301,L]
   dev-wegweiser-rheuma:
-    servername: dev-www-wegweiser-rheuma-de.pixelpark.net
+    servername: dev-www-wegweiser-rheuma-de.pixelpark.net # CName auf dev-web01-pfizer-de.pixelpark.net.
     docroot: '/srv/www/dev-www.wegweiser-rheuma-psoriasis.de/current'
     manage_docroot: false
     docroot_owner: apache
@@ -793,9 +784,9 @@ site::profile::apache::pp_vhosts:
         rewrite_cond:
           - '%%{ich-trickse}{REQUEST_URI} ^/rheuma.html$'
         rewrite_rule:
-          - ^/rheuma.html$ http://dev-www-wegweiser-rheuma-de.pixelpark.net [R=301,L]
+          - ^/rheuma.html$ https://dev-www-wegweiser-rheuma-de.pixelpark.net [R=301,L]
   dev-wegweiser-psoriasis:
-    servername: dev-www-wegweiser-psoriasis-de.pixelpark.net
+    servername: dev-www-wegweiser-psoriasis-de.pixelpark.net # CName auf dev-web01-pfizer-de.pixelpark.net.
     docroot: '/srv/www/dev-www.wegweiser-rheuma-psoriasis.de/current'
     manage_docroot: false
     docroot_owner: apache
@@ -838,7 +829,7 @@ site::profile::apache::pp_vhosts:
         rewrite_rule:
           - ^/psoriasis.html(.*)$ http://dev-www-wegweiser-psoriasis-de.pixelpark.net$1 [R=301,L]
   dev-static.pfizer:
-    servername: dev-static-pfizer-de.pixelpark.net
+    servername: dev-static-pfizer-de.pixelpark.net # CName auf dev-web01-pfizer-de.pixelpark.net.
     docroot: '/srv/www/dev-static.pfizer.de'
     ssl: false
     docroot_owner: apache
@@ -870,7 +861,7 @@ site::profile::apache::pp_vhosts:
         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'
   dev-www-breastcancer-matters-de:
-    servername: dev-www-breastcancer-matters-de.pixelpark.net
+    servername: dev-www-breastcancer-matters-de.pixelpark.net # CName auf dev-web01-pfizer-de.pixelpark.net.
     docroot: '/srv/www/dev-www-breastcancer-matters-de.pixelpark.net/drupal'
     docroot_owner: apache
     docroot_group: apache
@@ -904,7 +895,7 @@ site::profile::apache::pp_vhosts:
         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'
   dev-pfizer-dtd-preview:
-    servername: dev-pfizer-dtd-preview.pixelpark.net
+    servername: dev-pfizer-dtd-preview.pixelpark.net # CName auf dev-web01-pfizer-de.pixelpark.net.
     docroot: '/srv/www/dev-pfizer-dtd-preview'
     docroot_owner: apache
     docroot_group: apache