Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git

Conflicts:
	customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml

diff --cc customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
index 0712471593d755aecb204b787b84689e1fbe1709,57aa5274c6dffdb9a3d9957e87aefd4a69a5afdb..abf44814391197348b9f0e743b4f1c51f9e401bf
--- 1/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
--- 2/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
@@@ -17,7 -17,11 +17,10 @@@ infra::additional_classes
  apache::mod:proxy:
    proxy_via: 'Off'
  
 -
 -site::profile::apache::pp_vhosts:
+ apache::mod::remoteip::proxy_ips:
+   - '93.188.107.252'
+   - '93.188.107.253'
 +infra::profile::apache::pp_vhosts:
    cms:
      setenvif:
        - 'HTTPS on HTTPS=on'

diff --cc customer/mbvd-trapo/common.yaml
Simple merge

diff --cc customer/mbvd-trapo/dev-www-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
index 7314271faeb41bd7269dc2940ef326990db839ea,04de28e0972771040bc927800ce3da716dd32955..eda078fb0874b7cd76a9e819abf2c05451fff172
--- 1/customer/mbvd-trapo/dev-www-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
--- 2/customer/mbvd-trapo/dev-www-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
+++ b/customer/mbvd-trapo/dev-www-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
@@@ -6,10 -6,14 +6,14 @@@ accounts::users
      apply: true
      sudo: true
      group: "apache"
+   christof.hoefler:
+     apply: true
+     sudo: true
+     group: "apache"
  
 -site::additional_classes:
 -  - site::profile::drupal
 -  - site::profile::mysql_server
 +infra::additional_classes:
 +  - infra::profile::drupal
 +  - infra::profile::mysql_server
    - apache::mod::headers
  
  mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAlXwfJ+/QRfIqb4qnvoZ+e+aAhjynrFS9UPfd6RKn8XFA8ykoQ3PGPlg71OK2RZ60cY7NKUt6OaD0kdOnoLN3YwaDkKpIRgOZQD7a7yvjkl+E+jPYLbqLna036rY4sEWseBjXgENqXoP8a3QHZt/eIkn/QWnyxGUVSSOnK0WJTeBDaRm2Lc+BNaIJMxIdQ6RHTR537jxC6ZD7UN8SR44tyJrTc6E7foaHipqZkCLydcB82fjuYlwgAO6lXcyKzJhNlDYdtwyIF1A2fcP5AtfH5iKnSuqYMiFMtfZeZ6NiJOsl8EATTP0NEImi5TneRqAEmOWnH7HVRsvLiQe1TmmiXzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA7f3h4+q6iUBpkE/zMfzTDgCBejDxb0+NksYcDxnsAsL2o3UifQEpXJGgfAe2uEen0LQ==]