mbvd-amg-gt - Make puppet happy

diff --git a/customer/mbvd-amg-gt/common.yaml b/customer/mbvd-amg-gt/common.yaml
index 065c7b03aa122b84e7b3d6dff3fb52bcf6cbe87e..99dcd16e7ff5d07cd0dacd40efac7d7dd8d7c6c1 100644 (file)
--- a/customer/mbvd-amg-gt/common.yaml
+++ b/customer/mbvd-amg-gt/common.yaml
@@ -1,11 +1,8 @@
 ---
 site::role: base
 site::additional_classes:
-#   temporär deaktiviert --> wir warten noch auf das update von puppetlabs (apache modul / passenger_user)
-#  - apache::mod::headers
-#  - site::profile::ruby_passenger
+  - site::profile::ruby_passenger
   - site::profile::mysql_server
-  - git
 
 accounts::users:
   deploy.hamburg:

diff --git a/customer/mbvd-amg-gt/stage-web-amg-gt-de.pixelpark.net.yaml b/customer/mbvd-amg-gt/stage-web-amg-gt-de.pixelpark.net.yaml
index 87365c96d091d2203792904c85af548c865e6fa9..35594d841be189fb9bb4f8169d98c458a3b80ed4 100644 (file)
--- a/customer/mbvd-amg-gt/stage-web-amg-gt-de.pixelpark.net.yaml
+++ b/customer/mbvd-amg-gt/stage-web-amg-gt-de.pixelpark.net.yaml
@@ -1,8 +1,4 @@
 ---
-site::additional_classes:
-  - site::profile::ruby_passenger
-  - site::profile::mysql_server
-
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAiWzg9SvrEEUDRfi/draP4ax0KUfayaqM53WxMhtNj+4D7KaXMjsI9ur7gKgGxLwHfDQ40EHQMtg3e2uvjLacoXrl4A5d0ajcALWOv8iOpiMCPzy4CV++29cfZd0k82ZJheCotOTWMdauIQtdUok2VophvFwC09KkEvmBuYD9L1Ysm2eB1P+iAp1QRYJ8nrs/OA+tNrKinK7k5/KQN3q3iofDehbPFoDcauuDv1qWfscGkDmPegYwXJNPQreTAFujhkRMd2XO13jAz43Q4FQGv/BetL6z8DCH6DXhUXLDZesMC2D8BLkEnS6wDO+fkpZi0OqYAr8zgTqLDZixM5AlnTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCHCJHnFqRPTNoDFPPS3YeKgCAD1HFBVRYhMF2Uu0EDCN+wN4y1IMKQseasLIYR7B7cbw==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAm45LMAUW3zwvTV5oBeI7U1RsuZTMJAKKtFwF9Up0ov9CpVg/zmX/yvcljySgb/N/eToLUw2FlE00Z4UbgOf6KXLWUYlHqHeeBlwiRRnUFGQu5uzDs3nMPnPKQUESwWJtM3dZm2xvt3/H8Z6RXJaJnNwS7gEUbe02ytMvFn7CS3Wr7uMEMo4UIvfr5OZQ/fE1Jap+cu+jwRR9Z+paJWjXOaey+NSWqyphoJkSShtnw4r346da7JNH8F39jnxzTs7NE9IT6tUoKOmrq2p2IUqw97jZYbDPWm1dRn2oTHcNyNskD/IuhLyESvlWud2qsHULUPCqIeKE1X9rMf7ypDp/IDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC+D/osrOcT7qiH26L7nZX5gCBPNwqtaggmwNu3qjLAbSOCflnNuqWpK14jvJlzhufvhA==]
 site::profile::mysql_server::databases:

diff --git a/customer/mbvd-amg-gt/web-amg-gt-de.pixelpark.net.yaml b/customer/mbvd-amg-gt/web-amg-gt-de.pixelpark.net.yaml
index 9d54a0aad4dcc551fde94d78703e321ad676cf51..9f4ea672fdb4e647a8aca848430a0af163807e4f 100644 (file)
--- a/customer/mbvd-amg-gt/web-amg-gt-de.pixelpark.net.yaml
+++ b/customer/mbvd-amg-gt/web-amg-gt-de.pixelpark.net.yaml
@@ -23,6 +23,7 @@ site::profile::ruby_passenger::projects:
     passenger_user: amggt
     passenger_app_env: live
     approot: /var/www/amg-gt
+    approot_owner: apache
     ruby_version: 'ruby-2.2.5'
     directories:
       - directory_root: