set fbb default vhost

diff --git a/customer/fbb-ws/prd-ws01-fbb.pixelpark.net.yaml b/customer/fbb-ws/prd-ws01-fbb.pixelpark.net.yaml
index 104335e13e07c0b4d28c9c8aecf06c20363c3b97..8b096448ac75dfed18c6bf4ac5e414d8766d602e 100644 (file)
--- a/customer/fbb-ws/prd-ws01-fbb.pixelpark.net.yaml
+++ b/customer/fbb-ws/prd-ws01-fbb.pixelpark.net.yaml
@@ -39,8 +39,6 @@ php::settings:
   PHP/max_file_uploads: 50
   PHP/include_path: '.:/opt/app/ZendFramework/library:/opt/app/web' #muss angepasst werden
 
-apache::default_vhost: false
-
 infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQkzCNaKrUkNv5Jeq7Ebr53aJX3KDt5n9kI7yy050w71v1LrpdAkkESTZeuKLLjswjcMC5ICL5wMSwn+7aj6Gcn259EECdsVZydD/VMsSHEVN3aLUrByNuM4+mFpK0Jthi0hi8zqcej5e3mdQPiT6gcfai29htoPHS23zruLnNIkmJ62tpcWaGrYp+eXVVm522jbmL/+oewNv/6YFUrYBPXdomznkC/ReGB1YG/fbz3Vt5UaWFbZ19+8YxHHMlT5nyvkGNsWhVKKeSDgacDLJ9Gr0zw/iFs1lLojEGt9HarRYWtSGt5PbhhYLxtt75OLU+BA0q/gZTbGiHvguQ2rwqjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCIaKd8NKWcQ5fw1bElllIogBDy3gDC0xHpz9Zxv4+6nRST]
@@ -54,6 +52,7 @@ infra::profile::apache::pp_vhosts:
       - ws01.berlin-airport.de
       - prd-ws01-fbb.pixelpark.net
     ssl: false
+    default_vhost: true
     docroot_owner: apache
     docroot_group: apache
     setenv:

diff --git a/customer/fbb-ws/prd-ws02-fbb.pixelpark.net.yaml b/customer/fbb-ws/prd-ws02-fbb.pixelpark.net.yaml
index b7da2b2029d3c87aee8ec7b5708f55f85da99005..cf2c32c4c4608ed2204d669efb87e09d8364c45f 100644 (file)
--- a/customer/fbb-ws/prd-ws02-fbb.pixelpark.net.yaml
+++ b/customer/fbb-ws/prd-ws02-fbb.pixelpark.net.yaml
@@ -39,8 +39,6 @@ php::settings:
   PHP/max_file_uploads: 50
   PHP/include_path: '.:/opt/app/ZendFramework/library:/opt/app/web' #muss angepasst werden
 
-apache::default_vhost: false
-
 infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQkzCNaKrUkNv5Jeq7Ebr53aJX3KDt5n9kI7yy050w71v1LrpdAkkESTZeuKLLjswjcMC5ICL5wMSwn+7aj6Gcn259EECdsVZydD/VMsSHEVN3aLUrByNuM4+mFpK0Jthi0hi8zqcej5e3mdQPiT6gcfai29htoPHS23zruLnNIkmJ62tpcWaGrYp+eXVVm522jbmL/+oewNv/6YFUrYBPXdomznkC/ReGB1YG/fbz3Vt5UaWFbZ19+8YxHHMlT5nyvkGNsWhVKKeSDgacDLJ9Gr0zw/iFs1lLojEGt9HarRYWtSGt5PbhhYLxtt75OLU+BA0q/gZTbGiHvguQ2rwqjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCIaKd8NKWcQ5fw1bElllIogBDy3gDC0xHpz9Zxv4+6nRST]
@@ -54,6 +52,7 @@ infra::profile::apache::pp_vhosts:
       - ws02.berlin-airport.de
       - prd-ws02-fbb.pixelpark.net
     ssl: false
+    default_vhost: true
     docroot_owner: apache
     docroot_group: apache
     setenv:

diff --git a/customer/fbb-ws/tst-ws01-fbb.pixelpark.net.yaml b/customer/fbb-ws/tst-ws01-fbb.pixelpark.net.yaml
index a4c5479011fbff1f927ca6d2d7f000ca89102942..d19c8d2ca89797cf567817cc1043d9ae4ac4ecaa 100644 (file)
--- a/customer/fbb-ws/tst-ws01-fbb.pixelpark.net.yaml
+++ b/customer/fbb-ws/tst-ws01-fbb.pixelpark.net.yaml
@@ -39,8 +39,6 @@ php::settings:
   PHP/max_file_uploads: 50
   PHP/include_path: '.:/opt/app/ZendFramework/library:/opt/app/web' #muss angepasst werden
 
-apache::default_vhost: false
-
 infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQkzCNaKrUkNv5Jeq7Ebr53aJX3KDt5n9kI7yy050w71v1LrpdAkkESTZeuKLLjswjcMC5ICL5wMSwn+7aj6Gcn259EECdsVZydD/VMsSHEVN3aLUrByNuM4+mFpK0Jthi0hi8zqcej5e3mdQPiT6gcfai29htoPHS23zruLnNIkmJ62tpcWaGrYp+eXVVm522jbmL/+oewNv/6YFUrYBPXdomznkC/ReGB1YG/fbz3Vt5UaWFbZ19+8YxHHMlT5nyvkGNsWhVKKeSDgacDLJ9Gr0zw/iFs1lLojEGt9HarRYWtSGt5PbhhYLxtt75OLU+BA0q/gZTbGiHvguQ2rwqjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCIaKd8NKWcQ5fw1bElllIogBDy3gDC0xHpz9Zxv4+6nRST]
@@ -54,6 +52,7 @@ infra::profile::apache::pp_vhosts:
       - tstws01.berlin-airport.de
       - tst-ws01-fbb.pixelpark.net
     ssl: false
+    default_vhost: true
     docroot_owner: apache
     docroot_group: apache
     setenv:

diff --git a/customer/fbb-ws/tst-ws02-fbb.pixelpark.net.yaml b/customer/fbb-ws/tst-ws02-fbb.pixelpark.net.yaml
index 662dc795b64c9f961819479a3a9e2571c2308258..cdd8ba5408f4eae70597c38e7f36349d3abc5e20 100644 (file)
--- a/customer/fbb-ws/tst-ws02-fbb.pixelpark.net.yaml
+++ b/customer/fbb-ws/tst-ws02-fbb.pixelpark.net.yaml
@@ -39,8 +39,6 @@ php::settings:
   PHP/max_file_uploads: 50
   PHP/include_path: '.:/opt/app/ZendFramework/library:/opt/app/web' #muss angepasst werden
 
-apache::default_vhost: false
-
 infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQkzCNaKrUkNv5Jeq7Ebr53aJX3KDt5n9kI7yy050w71v1LrpdAkkESTZeuKLLjswjcMC5ICL5wMSwn+7aj6Gcn259EECdsVZydD/VMsSHEVN3aLUrByNuM4+mFpK0Jthi0hi8zqcej5e3mdQPiT6gcfai29htoPHS23zruLnNIkmJ62tpcWaGrYp+eXVVm522jbmL/+oewNv/6YFUrYBPXdomznkC/ReGB1YG/fbz3Vt5UaWFbZ19+8YxHHMlT5nyvkGNsWhVKKeSDgacDLJ9Gr0zw/iFs1lLojEGt9HarRYWtSGt5PbhhYLxtt75OLU+BA0q/gZTbGiHvguQ2rwqjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCIaKd8NKWcQ5fw1bElllIogBDy3gDC0xHpz9Zxv4+6nRST]
@@ -54,6 +52,7 @@ infra::profile::apache::pp_vhosts:
       - tstws02.berlin-airport.de
       - tst-ws02-fbb.pixelpark.net
     ssl: false
+    default_vhost: true
     docroot_owner: apache
     docroot_group: apache
     setenv:

diff --git a/customer/fbb-www/dev-www-fbb.pixelpark.net.yaml b/customer/fbb-www/dev-www-fbb.pixelpark.net.yaml
index fc7f38f8d9b8bbf8c8785ce17c3c6a8344645682..b266cdf548f230844fb486f334b837c4fdb37bbe 100644 (file)
--- a/customer/fbb-www/dev-www-fbb.pixelpark.net.yaml
+++ b/customer/fbb-www/dev-www-fbb.pixelpark.net.yaml
@@ -36,8 +36,6 @@ php::settings:
   PHP/max_file_uploads: 50
   PHP/include_path: '.:/opt/app/ZendFramework/library:/opt/app/web' #muss angepasst werden
 
-apache::default_vhost: false
-
 infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQkzCNaKrUkNv5Jeq7Ebr53aJX3KDt5n9kI7yy050w71v1LrpdAkkESTZeuKLLjswjcMC5ICL5wMSwn+7aj6Gcn259EECdsVZydD/VMsSHEVN3aLUrByNuM4+mFpK0Jthi0hi8zqcej5e3mdQPiT6gcfai29htoPHS23zruLnNIkmJ62tpcWaGrYp+eXVVm522jbmL/+oewNv/6YFUrYBPXdomznkC/ReGB1YG/fbz3Vt5UaWFbZ19+8YxHHMlT5nyvkGNsWhVKKeSDgacDLJ9Gr0zw/iFs1lLojEGt9HarRYWtSGt5PbhhYLxtt75OLU+BA0q/gZTbGiHvguQ2rwqjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCIaKd8NKWcQ5fw1bElllIogBDy3gDC0xHpz9Zxv4+6nRST]
@@ -47,6 +45,7 @@ infra::profile::apache::pp_vhosts:
     docroot: '/var/www/berlin-airport/web'
     servername: dev-www-fbb.pixelpark.net
     ssl: false
+    default_vhost: true
     docroot_owner: apache
     docroot_group: apache
     setenv:

diff --git a/customer/fbb-www/production.yaml b/customer/fbb-www/production.yaml
index f6678c5ce862017607ed79e02e9cb16d4649f981..2e2df67488620335fa7a68d0d3207e96c6853b77 100644 (file)
--- a/customer/fbb-www/production.yaml
+++ b/customer/fbb-www/production.yaml
@@ -35,8 +35,6 @@ php::settings:
   PHP/max_file_uploads: 50
   PHP/include_path: '.:/opt/app/ZendFramework/library:/opt/app/web' #muss angepasst werden
 
-apache::default_vhost: false
-
 infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQkzCNaKrUkNv5Jeq7Ebr53aJX3KDt5n9kI7yy050w71v1LrpdAkkESTZeuKLLjswjcMC5ICL5wMSwn+7aj6Gcn259EECdsVZydD/VMsSHEVN3aLUrByNuM4+mFpK0Jthi0hi8zqcej5e3mdQPiT6gcfai29htoPHS23zruLnNIkmJ62tpcWaGrYp+eXVVm522jbmL/+oewNv/6YFUrYBPXdomznkC/ReGB1YG/fbz3Vt5UaWFbZ19+8YxHHMlT5nyvkGNsWhVKKeSDgacDLJ9Gr0zw/iFs1lLojEGt9HarRYWtSGt5PbhhYLxtt75OLU+BA0q/gZTbGiHvguQ2rwqjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCIaKd8NKWcQ5fw1bElllIogBDy3gDC0xHpz9Zxv4+6nRST]
@@ -60,6 +58,7 @@ infra::profile::apache::pp_vhosts:
       - ber.berlin-airport.de
       - dialogforum-ber.de
     ssl: false
+    default_vhost: true
     docroot_owner: apache
     docroot_group: apache
     setenv:

diff --git a/customer/fbb-www/test.yaml b/customer/fbb-www/test.yaml
index a3f2d1719cc9e288caa05e584e45742c0be1b1a6..b7dfacef89ee136b6ba3d19dd904a398e6950fcd 100644 (file)
--- a/customer/fbb-www/test.yaml
+++ b/customer/fbb-www/test.yaml
@@ -35,8 +35,6 @@ php::settings:
   PHP/max_file_uploads: 50
   PHP/include_path: '.:/opt/app/ZendFramework/library:/opt/app/web' #muss angepasst werden
 
-apache::default_vhost: false
-
 infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQkzCNaKrUkNv5Jeq7Ebr53aJX3KDt5n9kI7yy050w71v1LrpdAkkESTZeuKLLjswjcMC5ICL5wMSwn+7aj6Gcn259EECdsVZydD/VMsSHEVN3aLUrByNuM4+mFpK0Jthi0hi8zqcej5e3mdQPiT6gcfai29htoPHS23zruLnNIkmJ62tpcWaGrYp+eXVVm522jbmL/+oewNv/6YFUrYBPXdomznkC/ReGB1YG/fbz3Vt5UaWFbZ19+8YxHHMlT5nyvkGNsWhVKKeSDgacDLJ9Gr0zw/iFs1lLojEGt9HarRYWtSGt5PbhhYLxtt75OLU+BA0q/gZTbGiHvguQ2rwqjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCIaKd8NKWcQ5fw1bElllIogBDy3gDC0xHpz9Zxv4+6nRST]
@@ -52,6 +50,7 @@ infra::profile::apache::pp_vhosts:
       - tst01.berlin-airport.de
       - tst02.berlin-airport.de
     ssl: false
+    default_vhost: true
     docroot_owner: apache
     docroot_group: apache
     setenv: