mbvd-eklasse - make puppet happe

diff --git a/customer/mbvd-eklasse/common.yaml b/customer/mbvd-eklasse/common.yaml
index 35d3d4c435d4d80f3695c670635426e59ca6410d..8561fa28ede3b62a88f215a5b54608fe290bf144 100644 (file)
--- a/customer/mbvd-eklasse/common.yaml
+++ b/customer/mbvd-eklasse/common.yaml
@@ -1,11 +1,8 @@
 ---
 site::role: base
 site::additional_classes:
+  - site::profile::ruby_passenger
   - site::profile::mysql_server
-  - git
-#   temporär deaktiviert --> wir warten noch auf das update von puppetlabs (apache modul / passenger_user)
-#  - apache::mod::headers
-#  - site::profile::ruby_passenger
 
 site::additional_packages:
   ImageMagick: {}

diff --git a/customer/mbvd-eklasse/stage-web-e-klasse-amazon-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-eklasse/stage-web-e-klasse-amazon-mercedes-benz-de.pixelpark.net.yaml
index 862627c27016197e05b5c7709e369e7a2d85df06..fec74e0f179d4e70b21d088f71dd5d61ac80a6e1 100644 (file)
--- a/customer/mbvd-eklasse/stage-web-e-klasse-amazon-mercedes-benz-de.pixelpark.net.yaml
+++ b/customer/mbvd-eklasse/stage-web-e-klasse-amazon-mercedes-benz-de.pixelpark.net.yaml
@@ -1,7 +1,4 @@
 ---
-site::additional_classes:
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXPivTqq8IHS+4tRA0gUFIw8o4zmXkea3DSpSpH5BzPKAwoj6soJwSafIR9Jds5R/xqh8BtalRtkpCujp0+4ogrwgl3CymEhgfmv7x2PhjsWRWa+yif+IwkjhziPjV6w5LbAZmrG0PABmoUUVhNVEbThnrmFKzlemehFOQLi1O0o8Axe2LU7IkdKSFz/ew0NMOPLYfGVAmkADnBZ+qxWqYM+fqAju8J3dOmTxrDr7AT8DEfnBQb77yPtym+I1469GjgI7MqX4wnj+qVDqryrFKabgomgUd9+GxgbOqe+cvHgYJHA+W53GQZmTyWJc1z034z8uvVZNurymJmozc3kvhzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDjERdHlf6Ud/D+SM6m7KF0gCDXgl9LVtxh8QjYzK/zdySHnkSKIFU0D7imUFrZkIayzA==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAu97sdUYC2qhqZr6oCPvl/xA4Y8BvdwO5zltl82pxCybmu/DZ+qL30eoDVvDgbemhH96z5eKQXgEbArG+iwl6oNHehgMXlQcIK7ObzZXVKT9SfejG3rgdTPw0ZtX/Qr7w0/g143JRnP9yAQF5vr2HxclHGStyB2ihAhLExZcLAy+sNBMFJpy3aOBHtwpZos1yFrsEnZw5zx7GodTn69DqRL36x3oNWtOCfLZOwie764igIO8B5/o8cPpRAC89Hof8Z2v0Ap44Z2JsA68BPF7kAe9ZneBMy2WBgErkCYa/T53kxRMI/n8nTeYHMFqVB6Y6yjcLRBZunYtjPfCHAMZ+VzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBF4Wq6wCnPMbUSLXSTsWLogCBeyGJv/0+RO29mw7aLuiz65PEj6rGwLIzHwLj9NUEuxw==]
 site::profile::mysql_server::databases:
@@ -23,7 +20,6 @@ site::profile::ruby_passenger::projects:
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     passenger_user: eklasse
     passenger_app_env: stage
-    approot_owner: apache
     approot: /var/www/eklasse
     approot_owner: apache
     ruby_version: 'ruby-2.2.5'