From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Wed, 5 Apr 2017 14:08:45 +0000 (+0200)
Subject: Merge branch 'master' of git@git.pixelpark.com:puppet/hiera.git
X-Git-Tag: v0.1.0~3303
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=92ce650ddc75f41c894618d049a22cd37e16e65b;p=pixelpark%2Fhiera.git

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

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

92ce650ddc75f41c894618d049a22cd37e16e65b
diff --cc customer/mbvd-odt/cms-odt-daimler-com.pixelpark.net.yaml
index 07124715,57aa5274..abf44814
--- a/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'
  
+ apache::mod::remoteip::proxy_ips:
+   - '93.188.107.252'
+   - '93.188.107.253'
 -
 -site::profile::apache::pp_vhosts:
 +infra::profile::apache::pp_vhosts:
    cms:
      setenvif:
        - 'HTTPS on HTTPS=on'
diff --cc customer/mbvd-trapo/dev-www-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
index 7314271f,04de28e0..eda078fb
--- a/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==]