mbvd-eklasse-tmodell - make puppet happy

diff --git a/customer/mbvd-eklasse-tmodell/common.yaml b/customer/mbvd-eklasse-tmodell/common.yaml
index 7bfa07bd4c66fbc588a67abbd45f7607365789dd..4c99a3820532a287eef331f0ac8a84320d598149 100644 (file)
--- a/customer/mbvd-eklasse-tmodell/common.yaml
+++ b/customer/mbvd-eklasse-tmodell/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-tmodell/stage-web-e-klasse-t-modell.pixelpark.net.yaml b/customer/mbvd-eklasse-tmodell/stage-web-e-klasse-t-modell.pixelpark.net.yaml
index 6064cebce4df11b41d629a35ad9fa33c2f8aad1e..7f4b57e747d430962a5ffd7dee62104781520ea2 100644 (file)
--- a/customer/mbvd-eklasse-tmodell/stage-web-e-klasse-t-modell.pixelpark.net.yaml
+++ b/customer/mbvd-eklasse-tmodell/stage-web-e-klasse-t-modell.pixelpark.net.yaml
@@ -1,8 +1,4 @@
 ---
-site::additional_classes:
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
-
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAUIl3eUSfIejSxwmWYucJSqbfeKRsp4V987TyNjY5nw1z++HUWQJAalzeVrAn0lW6oXYeQ14Mm4zobbYlmSQw6pab14BOzHaPmx7gikgy/0Ad8uPNxms76R4XRq7Sr2+OSjThHR2SVSw3ZjSXr/7oN7isTXaSpk63LCmJTeiQde6KYC3ZitYM258DJoNrCErrg2sEhXYuH5Wl0eWbb1WZ6hHrWcueG/62o3Xv35JyReqZLmls8SAnTNpc7Vr80QV/oKDu1jzt+niiT1ai31UuI6vVW2ejpPJyoj/YdTluEnWvngsHBT6qSAofSNs7i5i0vJEKaTYCw7Argb1yzLe2QTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDDOsEeAR5f/mHy4zqOIBkdgCCReqo1q5tifQ2VrHIjItm4Y9GJ1zPMpbLyNVo5ga0GaA==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAc90YHvsb82C4WBKxPXcesYKI98P4vzN6No3m7RqxddeimGrj5WL7LuD4SoYxC2+g6Gd/STnef037NJJhNiX3kGvZuQwoT9ZRRGf5RLvaTOHob1G3WpyTlFm9UtV9HRV488jvx7k7jvTu35l/osCPLlXRRG0Zz7oQcbSfBobg5oCF06LUBg3QIYtCPvEhYFNYrV8oSjWNSu4P4WAjyc7ed0PJgP0xncJJ66wOuznKj9lWq0psXSrjDlMeUaBMHeQPNhaQyT2Xk/kGtVOCBPx6L8y7Rbk4a+nqxaDc7LrvmsdINkqfFuFkW3Rzk11bGDko2aHWz8TaZY84Zxjy1sweSzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDwFg9Strv0lF/obBasyd2cgCDHB+ffGvyBnqeivK6yGVbe3vtyUOGVn70UZo+PAtCXQg==]
 site::profile::mysql_server::databases:
@@ -24,7 +20,6 @@ site::profile::ruby_passenger::projects:
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     passenger_user: tmodell
     passenger_app_env: stage
-    approot_owner: apache
     approot: /var/www/tmodell
     approot_owner: apache
     ruby_version: 'ruby-2.2.5'