From 5fd09810496deeb01f47bd9efab26cb9327bcfc2 Mon Sep 17 00:00:00 2001
From: Thomas Heller <thomas.heller@pixelpark.com>
Date: Thu, 20 Oct 2016 14:32:05 +0200
Subject: [PATCH] ngcc - added new databases etc.

---
 customer/mbvd-ngcc/common.yaml                | 45 +++++++++++++
 .../dev-web-ngcc-daimler.pixelpark.net.yaml   | 67 +++++--------------
 2 files changed, 60 insertions(+), 52 deletions(-)
 create mode 100644 customer/mbvd-ngcc/common.yaml

diff --git a/customer/mbvd-ngcc/common.yaml b/customer/mbvd-ngcc/common.yaml
new file mode 100644
index 00000000..601164f8
--- /dev/null
+++ b/customer/mbvd-ngcc/common.yaml
@@ -0,0 +1,45 @@
+---
+site::role: base
+site::additional_classes:
+  - site::profile::drupal
+  - site::profile::mysql_server
+  - nodejs
+
+accounts::users:
+  andreas.pinto-koehler:
+    apply: true
+    sudo: true
+    group: apache
+  thomas.bussmeyer:
+    apply: true
+    sudo: true
+    group: apache
+  dennis.klein:
+    apply: true
+    sudo: true
+    group: apache
+  peter.kreinz:
+    apply: true
+    sudo: true
+    group: apache
+  jenkins:
+    apply: true
+    group: apache
+
+sudo::configs:
+  deploy_rights:
+    priority: "06"
+    content: |
+      jenkins ALL=(apache) NOPASSWD: ALL
+
+repo::remi_php70: true
+nodejs::repo_url_suffix: '4.x'
+
+mysql::server::override_options:
+  mysqld:
+    bind-address: 0.0.0.0
+    character-set-server: utf8
+    collation-server: utf8_general_ci
+
+apache::default_vhost: false
+apache::mpm_module: worker
diff --git a/customer/mbvd-ngcc/dev-web-ngcc-daimler.pixelpark.net.yaml b/customer/mbvd-ngcc/dev-web-ngcc-daimler.pixelpark.net.yaml
index f1306657..4187b517 100644
--- a/customer/mbvd-ngcc/dev-web-ngcc-daimler.pixelpark.net.yaml
+++ b/customer/mbvd-ngcc/dev-web-ngcc-daimler.pixelpark.net.yaml
@@ -1,61 +1,25 @@
 ---
-site::role: base
-
-site::additional_classes:
-  - site::profile::drupal
-  - site::profile::mysql_server
-  - nodejs
-
-accounts::users:
-  andreas.pinto-koehler:
-    apply: true
-    sudo: true
-    group: apache
-  thomas.bussmeyer:
-    apply: true
-    sudo: true
-    group: apache
-  dennis.klein:
-    apply: true
-    sudo: true
-    group: apache
-  peter.kreinz:
-    apply: true
-    sudo: true
-    group: apache
-  jenkins:
-    apply: true
-    group: apache
-
-sudo::configs:
-  deploy_rights:
-    priority: "06"
-    content: |
-      jenkins ALL=(apache) NOPASSWD: ALL
-
-repo::remi_php70: true
-
-nodejs::repo_url_suffix: '4.x'
-
-mysql::server::override_options:
-  mysqld:
-    bind-address: 0.0.0.0
-    character-set-server: utf8
-    collation-server: utf8_general_ci
-
-php::settings:
-  Date/date.timezone: Europe/Berlin
-  PHP/expose_php: 'Off'
-
-apache::default_vhost: false
-apache::mpm_module: worker
-
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAiMhPdM6kg7q2P0/GD5AI9gEqNmKDc4J8BDiwfYCCq2HVnxLyhOMz9dtNQjQMPnMygkkgKc3FMwBdPxf/b4ud57bXAFOhKLalCuLzEeyOtGBaddw8GZ6mjv5xrKw1tKAjH5ZNebT9TPn4XBqMchebZ/s4vYInhlEqEYgmt55B7KEe8vMdCnJe4/zU127FsyruK+ZRFQW05r3ka7dA+ZQbQ/W/zgug2t32oShf23C/tF70IcEYXcrq23e2E1YAzAXJb5GeC7mbcSLRK1ARdKOSxL7cGEi2aPVg+ArjeJrGHgKQKL98aDqGBAC5S2JSlGg1klB6a6SQkJNodkbWiO7GnDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBADCmLJi7lWTsZJehjf3Pr7gCAOGpMJz3Vh9MDAAyrSCjLTmsc8XLRoEPwxqZXqy/OYCw==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAh6ufUQ9Yw90FzaEV0xQmZkUsJCqrd3Zmq49Uh9r6/wY5y/bmLFXW63dNMbWJbngW5eVx5EBc+R/J8LgRCfAr+DHZCq2Rqk3fVz0WM1hhe5asFz/gz8tefsi+wGEdNAUx34UUwFrmlZlkduPV0P2vv9bKsKbF2U9SZBNSq0Yons1hx+S98fMdve+8jKMnQi/fjHIpAndBVYC0ZcHHeScCC3Jxvh1gK9hH95nWparqQcyMr92SdJZLCeb0OjWuxe8bSH6Z5n/JRPbT3fOd9GAqn3g994lWQEroij3SGno8L6QfuPWCSfQkzIbusCW9LqYLroRNYyWLP4kepvFXQiUXRzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBxqMFkKpEut/Ld5Uob2tREgCD64o+E60OdRkbyQu0T/HGNHILnjLMovPrw67yd+cIp/g==]
 site::profile::mysql_server::databases:
   ngcc:
     user: ngcc
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEABwNFjVq0fwwF1Og//LWHkWl+5s41VT3IkJvpEuLzpKDkkPgzHwaS16KBQ7IqfPqH7I8T0LRwzV9wPRGTYwUD8K6Hxevpd6bYXAspJFLyH+3wBBZg6OOVzCpyzq0hzVKjHCjnzqT/U167rzBUUElkeTvt87vF+lFy7hD7lvFYC4do8VkeG6NOfUlkchQ1JC0f8SA2Hq2GtIsZeeKQIcvhEmdtd+coChA85gfpsy4Wc2vgfwXZv2eafYv0BPrP5ledrwkHOzk1nijUbDZu+jMtn/HTQnLttrL4atsaZSq06SD76Cx1Vihk6P3OJiHaso1j72ROVbGYpkhCh+th5vDjDzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCR9g2Hh1jBJeAsNdkYDzUMgCAusWmRQb3WTxOmMs+LhMNdKX3JQMOKj/q0BtnQwbnkqw==]
+  marketES:
+    user: marketES
+    password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAkm3xsfxXBHPUgH/DD+TxfKW0XtY9u6J88dGq19qjCy5qa57iat/TWIbaamooKCqNeAM1KusAW7p3KOdJVPfDmG1n2e9q4EsqTXVwG/QMq7pQWS2cT4niI9UgR8yHnI2KLPLyVppw+ELUECBUPzfKpRV5h7jHbOYaBatJL0LP6Z8sFmCAUeAo3e0piun4eNIbT0hEtRrYQaHj1d30MLrUNdYJ3S2lbYkVz6/5LEQfzNNAFZYf2Sipqg+SQE7aSJRdo27YCnLfvNkBPjcPSocyIItPRuNuUBWYim2A3LWFKULISq2im4EkIBBbP/DLIcB6+vlu0JDy4XnXPfu6uPoiITA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAiSCO+KK8eu0+E3E3E1gYZgBCDvhM4H/q9xLU4JyuvuEkN]
+  marketIT:
+    user: marketIT
+    password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAlnCbTVub5mi2yrymLCsBxAdHaQbC8/vV/uSHs2ylnzBNLR92ynJz66xrT1IGeqGFV+soEjE91AHQGc2xo2Q0qtI8zhdaiyJhdOiv9/9w5BRbsUsLv9TUZIFwfgn2KPrgLQSn188GJubdcL7L1PwX3NzthQ6IE8ZCE9KxnuAeOsNThNjrgwlfqNAyR+F2aAVIcpIS/6Xr8iOMyVW73/qvi0ic9Hv+qdEfuTAwH2SXx/x18geqSASbfHupfmwPJPGJXZ7BXlBfOjU2Wjm8emxon54ymlhs+U4fEkOHZpOlWVe+q7vNezbAnTfXTBIBdg0vuzM/tN3CTzcRuK+ocVc6PzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBBDcaBfxFMZKw21Yj7T9pSgBCHhlk6IEas84emDs1L/Kiu]
+  marketFR:
+    user: marketFR
+    password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEADGGNS+DwXrEPpIXJce1vSIT0IY1APUQS7StuaToFLjoWG088k0YAKood6yPmHcYIM/SrQYbcyn6MS9aXxZ7zUjcQG3Ov44ZHQeCFL4vDxes7IpoW+WliMb5ojeeQhIxu3MuhAfgsOOdZ6VzpD3tmltBIWNElYq9n7ApOmb3T6NATBO9Y2Fr2IhWbyMY+4XJvInrbjZPZeMbpK2l1P4l4QFd/7dQdQ85FrcxSCJU7dtf0Z48kpBpCsKPezZnJUN75GgtgZPgreHVEUCRaBM8DGWp0pFolYEQiSf8fiWuaSmOpL5FFc+odpW04PqfUgs/rlrg2gA8xNWmt++O2Q0bNLzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDbpNGD/Kt99nxD2j1jXcqxgBAgf+vaPWpzBV9ba/80YpRZ]
+  marketDE:
+    user: marketDE
+    password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAnUSoSyiMCr/it8Hsl7zNxzFSqMO2Fauk5hlt/HK1Nbcke0EOVeXnH3a6sl1sxIL1Mt9DmKPl0VnxR0Lw+JFHAMSVzBvuczeM5ummrbBUWrGwSyXUdvJP1bXZ6GHxlOfS6niIiMvGX2kc4sUJLoSm9k8dBDnkGGrpU9+HqkqHZ55kvB0UgEAuvmjh5BUqldzorlxT5q8SDn/LmexGogUw0zlL7vAcrJ3V1hqCr59nCm8G/HeTNsWbvUz7LjahHYSGL3eSvV7pz7Jfhr0fK3uvGyRHKTfRUnk84DLlvc6kx6Tn3Xybyod3KPoISfSEciJl73Ltjq8lOYs/SsDDhA6aqjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBlrnu94rDf3+1AoIeYw9xJgBDRmsj/1Ma1EwTSKFuIPJfy]
+  marketUK:
+    user: marketUK
+    password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAMIR6c59n417F5bw9XTgICxdWXEoMoVoRM1O49rPEEiMiY0JgwnRLnekePyAwJgjNUBisJdx458YV/uAUsJQdKTS69lsczacjg7d7/k4frKZt0txT388yBIBscfoHyXuHApWc7qIHyoY7DxP8fXKqqtp1f4L316YUF2TTXtpL0yEMFfZBlARyflAFTt6RInUkQFzSyeRlPHkN7QYhRmNH97N33XeXxApK8JvAt5gT8i4G7M1uSB26DLIjsE1yVBAEZ3V7wkgTJjDczYFEAIxrSD9Xkinik96EDATtCJi/+z7Geei/JenlEXwLD23Hv5ERaOIhJiLzmt25FGgPPKSs2jA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCBpX8dYzZmCcArjxy1dgUfgBB7hQzbk/+4KSzdqJzHfYOM]
 
 site::profile::apache::htdigest:
   server:
@@ -85,7 +49,6 @@ site::profile::drupal::projects:
           - All
         addhandlers:
           - { handler: "proxy:unix:/var/run/php5-fpm-ngcc.sock|fcgi://./" , extensions: '.php' }
-        directoryindex: index.html index.php
       - location_root:
         provider: location
         path: '/'
-- 
2.39.5