pfizer - cleanup

diff --git a/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml b/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml
index ba04de3d79919c0ab27db20473d23e49d2edac36..abcecb38c5de4d5d6ebdafb533269bb55e8c62bf 100644 (file)
--- a/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml
+++ b/customer/pfizer/test-web01-pfizer-de.pixelpark.net.yaml
@@ -593,11 +593,11 @@ site::profile::typo3::projects:
         rewrite_rule:
           - ^(.*)$ https://test-www-pfizer-de.pixelpark.net [L,R=301]
 
-site::profile::apache::vhosts:
+site::profile::apache::pp_vhosts:
   pfizer-berlin:
     servername: test-www-pfizer-berlin.pixelpark.net
     docroot: '/srv/www/mspfizerberlin'
-    port: 80
+    ssl: false
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '0770'
@@ -621,11 +621,10 @@ 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'
-
   ich-beim-arzt:
     servername: test-ich-beim-arzt-de.pixelpark.net
     docroot: '/srv/www/test-www.ich-beim-arzt.de'
-    port: 80
+    ssl: false
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '0770'
@@ -649,11 +648,10 @@ 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'
-
   lungenkrebs-testen-at:
     servername: test-www-lungenkrebs-testen-at.pixelpark.net
     docroot: '/srv/www/test-www.lungenkrebs-testen.at'
-    port: 80
+    ssl: false
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '0770'
@@ -678,42 +676,12 @@ 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'
-
   lungenkrebs-testen-de:
     servername: test-www-lungenkrebs-testen-de.pixelpark.net
     docroot: '/srv/www/test-www.lungenkrebs-testen.de'
-    port: 80
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '0770'
-    directories:
-      - directory_root:
-        provider: directory
-        path: '/srv/www/test-www.lungenkrebs-testen.de'
-        options:
-          - FollowSymLinks
-          - MultiViews
-        allow_override:
-          - All
-      - location_root:
-        provider: location
-        path: '/'
-        auth_type: Digest
-        auth_name: pixelrealm
-        auth_digest_provider: file
-        auth_digest_algorithm: MD5
-        auth_user_file: '/etc/httpd/htdigest'
-        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'
-  lungenkrebs-testen-de_ssl:
-    servername: test-www-lungenkrebs-testen-de.pixelpark.net
-    docroot: '/srv/www/test-www.lungenkrebs-testen.de'
-    port: 443
-    docroot_owner: apache
-    docroot_group: apache
-    docroot_mode: '0770'
-    ssl: true
     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
@@ -737,7 +705,6 @@ 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'
-
   impf2ab60:
     servername: test-www-impf2ab60-de.pixelpark.net
     serveraliases:
@@ -750,7 +717,7 @@ site::profile::apache::vhosts:
       - test-www-impf2-ab-60-de.pixelpark.net
       - test-www-impf2-de.pixelpark.net
     docroot: '/srv/www/test-www.impf2ab60.de'
-    port: 80
+    ssl: false
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '0770'
@@ -774,63 +741,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'
-
   wegweiser-rheuma-psoriasis:
     servername: test-www-wegweiser-rheuma-psoriasis-de.pixelpark.net
     docroot: '/srv/www/test-www.wegweiser-rheuma-psoriasis.de/current'
     manage_docroot: false
-    port: 80
-    docroot_owner: apache
-    docroot_group: apache
-    docroot_mode: '0770'
-    directories:
-      - directory_root:
-        provider: directory
-        path: '/srv/www/test-www.wegweiser-rheuma-psoriasis.de/current'
-        options:
-          - FollowSymLinks
-          - MultiViews
-        allow_override:
-          - All
-      - location_root:
-        provider: location
-        path: '/'
-        auth_type: Digest
-        auth_name: pixelrealm
-        auth_digest_provider: file
-        auth_digest_algorithm: MD5
-        auth_user_file: '/etc/httpd/htdigest'
-        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:
-      - www:
-        comment: 'Alles nach test-www'
-        rewrite_cond:
-          - '%%{ich-trickse}{HTTP_HOST} ^wegweiser-rheuma-psoriasis.de$'
-        rewrite_rule:
-          - ^(.*)$ https://test-www.wegweiser-rheuma-psoriasis.de$1 [R=301,L]
-      - 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]
-      - psoriasis:
-        comment: 'Redirect to psoriasis domain'
-        rewrite_cond:
-          - '%%{ich-trickse}{REQUEST_URI} ^/psoriasis.html$'
-        rewrite_rule:
-          - ^(/psoriasis.html)$ https://test-www-wegweiser-psoriasis-de.pixelpark.net$1 [R=301,L]
-  wegweiser-rheuma-psoriasis_ssl:
-    servername: test-www-wegweiser-rheuma-psoriasis-de.pixelpark.net
-    docroot: '/srv/www/test-www.wegweiser-rheuma-psoriasis.de/current'
-    manage_docroot: false
-    port: 443
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '0770'
-    ssl: true
     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
@@ -867,53 +784,13 @@ site::profile::apache::vhosts:
           - '%%{ich-trickse}{REQUEST_URI} ^/psoriasis.html$'
         rewrite_rule:
           - ^(/psoriasis.html)$ https://test-www-wegweiser-psoriasis-de.pixelpark.net$1 [R=301,L]
-
   wegweiser-rheuma:
     servername: test-www-wegweiser-rheuma-de.pixelpark.net
     docroot: '/srv/www/test-www.wegweiser-rheuma-psoriasis.de/current'
     manage_docroot: false
-    port: 80
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '0770'
-    directories:
-      - directory_root:
-        provider: directory
-        path: '/srv/www/test-www.wegweiser-rheuma-psoriasis.de/current'
-        options:
-          - FollowSymLinks
-          - MultiViews
-        allow_override:
-          - All
-        directoryindex: rheuma.html
-      - location_root:
-        provider: location
-        path: '/'
-        auth_type: Digest
-        auth_name: pixelrealm
-        auth_digest_provider: file
-        auth_digest_algorithm: MD5
-        auth_user_file: '/etc/httpd/htdigest'
-        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]
-
-  wegweiser-rheuma_ssl:
-    servername: test-www-wegweiser-rheuma-de.pixelpark.net
-    docroot: '/srv/www/test-www.wegweiser-rheuma-psoriasis.de/current'
-    manage_docroot: false
-    port: 443
-    docroot_owner: apache
-    docroot_group: apache
-    docroot_mode: '0770'
-    ssl: true
     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
@@ -945,52 +822,13 @@ site::profile::apache::vhosts:
           - '%%{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
     docroot: '/srv/www/test-www.wegweiser-rheuma-psoriasis.de/current'
     manage_docroot: false
-    port: 80
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '0770'
-    directories:
-      - directory_root:
-        provider: directory
-        path: '/srv/www/test-www.wegweiser-rheuma-psoriasis.de/current'
-        options:
-          - FollowSymLinks
-          - MultiViews
-        allow_override:
-          - All
-        directoryindex: psoriasis.html
-      - location_root:
-        provider: location
-        path: '/'
-        auth_type: Digest
-        auth_name: pixelrealm
-        auth_digest_provider: file
-        auth_digest_algorithm: MD5
-        auth_user_file: '/etc/httpd/htdigest'
-        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]
-  wegweiser-psoriasis_ssl:
-    servername: test-www-wegweiser-psoriasis-de.pixelpark.net
-    docroot: '/srv/www/test-www.wegweiser-rheuma-psoriasis.de/current'
-    manage_docroot: false
-    port: 443
-    docroot_owner: apache
-    docroot_group: apache
-    docroot_mode: '0770'
-    ssl: true
     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
@@ -1022,11 +860,10 @@ site::profile::apache::vhosts:
           - '%%{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
     docroot: '/srv/www/test-static.pfizer.de'
-    port: 80
+    ssl: false
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '0770'
@@ -1050,8 +887,6 @@ 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'
-
-site::profile::apache::pp_vhosts:
   dialogrunde-blutkrebs:
     servername: test-www-dialogrunde-brustkrebs-de.pixelpark.net # Pixelpark-Domain
     ssl: false