fbb-www - add other vhosts

diff --git a/customer/fbb-www/production.yaml b/customer/fbb-www/production.yaml
index fb5e29b03ec49bc46a3714586f89cd3bf60a803a..17e52736fb619a86308d7eda7dc916840427a4ba 100644 (file)
--- a/customer/fbb-www/production.yaml
+++ b/customer/fbb-www/production.yaml
@@ -147,12 +147,41 @@ infra::profile::apache::htdigest:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQkzCNaKrUkNv5Jeq7Ebr53aJX3KDt5n9kI7yy050w71v1LrpdAkkESTZeuKLLjswjcMC5ICL5wMSwn+7aj6Gcn259EECdsVZydD/VMsSHEVN3aLUrByNuM4+mFpK0Jthi0hi8zqcej5e3mdQPiT6gcfai29htoPHS23zruLnNIkmJ62tpcWaGrYp+eXVVm522jbmL/+oewNv/6YFUrYBPXdomznkC/ReGB1YG/fbz3Vt5UaWFbZ19+8YxHHMlT5nyvkGNsWhVKKeSDgacDLJ9Gr0zw/iFs1lLojEGt9HarRYWtSGt5PbhhYLxtt75OLU+BA0q/gZTbGiHvguQ2rwqjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCIaKd8NKWcQ5fw1bElllIogBDy3gDC0xHpz9Zxv4+6nRST]
 
 infra::profile::apache::pp_vhosts:
+  information-berlin-airport:
+    docroot: '/var/www/information-berlin-airport'
+    servername: information.berlin-airport.de
+    serveraliases:
+      - information01.berlin-airport.de
+      - information02.berlin-airport.de
+    ssl: false
+    docroot_owner: apache
+    docroot_group: apache
+  download-berlin-airport:
+    docroot: '/var/www/download-berlin-airport'
+    servername: download.berlin-airport.de
+    serveraliases:
+      - download01.berlin-airport.de
+      - download02.berlin-airport.de
+      # Pixelpark Domains
+      - download-berlin-airport-de.pixelpark.net
+      - download01-berlin-airport-de.pixelpark.net
+      - download02-berlin-airport-de.pixelpark.net
+    ssl: false
+    docroot_owner: web
+    docroot_group: fbb
+  media-berlin-airport:
+    docroot: '/var/www/media-berlin-airport'
+    servername: media.berlin-airport.de
+    serveraliases:
+      - media01.berlin-airport.de
+      - media02.berlin-airport.de
+    ssl: false
+    docroot_owner: presse.upload
+    docroot_group: fbb
   berlin-airport:
     docroot: '/var/www/berlin-airport'
     servername: prd-www-fbb.pixelpark.net
     serveraliases:
-      - prd-www01-fbb.pixelpark.net
-      - prd-www02-fbb.pixelpark.net
       - www.berlin-airport.de
       - berlin-airport.de
       - www01.berlin-airport.de
@@ -166,6 +195,11 @@ infra::profile::apache::pp_vhosts:
       - dialogforum-ber.de
       - m.berlin-airport.de
       - real-estate.berlin-airport.de
+      # Pixelpark Domains
+      - prd-www01-fbb.pixelpark.net
+      - prd-www02-fbb.pixelpark.net
+      - www01-berlin-airport-de.pixelpark.net
+      - www02-berlin-airport-de.pixelpark.net
     ssl: false
     default_vhost: true
     docroot_owner: apache

diff --git a/customer/fbb-www/test.yaml b/customer/fbb-www/test.yaml
index 87b08b90b28c1dbe763437fb339355a8dceb4cf2..563ef2bcc072dd60a2ad91e30c0349698412a1d2 100644 (file)
--- a/customer/fbb-www/test.yaml
+++ b/customer/fbb-www/test.yaml
@@ -214,6 +214,37 @@ infra::profile::apache::htdigest:
     kundendienst: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhLnV/zAp/6OEsCwFAOp+DfkOg6e3kCIJnGyCd5/nAqo3/uNiV9YLQzrGbnlGWm//41VUt9LkuGqEuYgN8am7MIrBiAd7ewK3hDe9ThWk7dnu0qPwG5aRCMMl75u56hyooQjm++ingFGb9+SNcgTHPdIpViwjCwnnoYqp2V+ZZTMg0CFqo0wjHs7X2LPOIVcS/W7h1L9gp9qCHZ2NK1Zv7UZhJf3zfocbWFloED3g4YISVPZreaM/UxJ3eN7Ie9vsAFWsP4BEPbwO8QyjNhU1R7LV2A6LHyuxOQWRZlRZLW2mNL4pB0055+iF1zojeKuED4ac2aqON3bW3Zzi+oZYYDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCqWdzZhMUxn7OrkshXt5K7gBBFFpaXrWOIIvMKDDQ5DYhe]
 
 infra::profile::apache::pp_vhosts:
+  information-berlin-airport:
+    docroot: '/var/www/information-berlin-airport'
+    servername: tstinformation.berlin-airport.de
+    serveraliases:
+      - tstinformation01.berlin-airport.de
+      - tstinformation02.berlin-airport.de
+    ssl: false
+    docroot_owner: apache
+    docroot_group: apache
+  download-berlin-airport:
+    docroot: '/var/www/download-berlin-airport'
+    servername: tstdownload.berlin-airport.de
+    serveraliases:
+      - tstdownload01.berlin-airport.de
+      - tstdownload02.berlin-airport.de
+      # Pixelpark Domains
+      - test-download-berlin-airport-de.pixelpark.net
+      - test-download01-berlin-airport-de.pixelpark.net
+      - test-download02-berlin-airport-de.pixelpark.net
+    ssl: false
+    docroot_owner: web
+    docroot_group: fbb
+  media-berlin-airport:
+    docroot: '/var/www/media-berlin-airport'
+    servername: tstmedia.berlin-airport.de
+    serveraliases:
+      - tstmedia01.berlin-airport.de
+      - tstmedia02.berlin-airport.de
+    ssl: false
+    docroot_owner: presse.upload
+    docroot_group: fbb
   berlin-airport:
     docroot: '/var/www/berlin-airport'
     servername: tst-www-fbb.pixelpark.net