mbvd-service - make puppet happy

diff --git a/customer/mbvd-service/common.yaml b/customer/mbvd-service/common.yaml
index 873909a7ce96e91a93713b2e436d0b8bb22cb6eb..7a8861c0ffd50c8d85593dda967865860bdf9819 100644 (file)
--- a/customer/mbvd-service/common.yaml
+++ b/customer/mbvd-service/common.yaml
@@ -1,10 +1,8 @@
 ---
 site::role: base
 site::additional_classes:
-#  - apache::mod::headers
-#  - site::profile::ruby_passenger
+  - site::profile::ruby_passenger
   - site::profile::mysql_server
-  - git
 
 site::additional_packages:
   ImageMagick: {}

diff --git a/customer/mbvd-service/stage-web-mbvd-service-de.pixelpark.net.yaml b/customer/mbvd-service/stage-web-mbvd-service-de.pixelpark.net.yaml
index cad50cc9940783fd3b5a84cf98e2a04102d467db..a4bddecbef95c7cbc3de192bf351ce732c51d497 100644 (file)
--- a/customer/mbvd-service/stage-web-mbvd-service-de.pixelpark.net.yaml
+++ b/customer/mbvd-service/stage-web-mbvd-service-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,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApC+6wgBWKSYZxEuFtCexjUaVlBtQKANgQviiDy9HBg3X6irGgTeEoSG2FG04UDsY6EZCBYpeUToW+B0SmpaP95SpEp3ohv1Xtk1m+FNLnShUMtfxZ5fQcN32HvnjyCF76lVB6mtGO2K7XhOa0Lu705r1e7QM5jcSLFJlTBfh91i9HkI3AUtjyNY+PPBGMod8kQQ2cL3xaVpmNSEaEpfacJzQHKE2EWYGQFX+/lcTUhP0WUVqslfnO44kHPUxI21EKv2vvarFWA2AnIq+8zAh6ACFlqN28kcmlaLfk7CluU6AJ64bUQbAzwQ5yii+VoAptt5ejuYs2mRDCxZD/2LevTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA/SNPpkS02NyZXnDgRFpI/gCDMI5nlXXfu/1wCp8ZUM+QJrOWWV075PbWeKHHIN2KDIA==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJSYl1/2o0kA++OGYH5JtsBhH9GztzBulDyINhHLVHnv6B/sAwWEek8PrHupSgk9TAMOz8dm9wk+4pOc+6X3FdOEUe3RlfJfxiWeHomhZeEC8IkVIAu8iBhWNL6szjsF3y6lQjuuh9DdtUcdGIX1twPUdaluJ9rNL7xFVkt/6zG9cHfI72GXEJguUp9WvNNoEjq1zePVGmAOA7zSbBq7aTrcapy5RacFn29+XIgUBViHDcOh1KDM0Ni/qPhb+0Apzzgw5SWxdsfEfl7I8RJB9Gs4p75EXbFTYnuXZXtSfoMpBWmMZFC3z/B/xP1Vx4yo60qhPbO7uIVQvPJJakjuAlzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBFheb0aVrcYBE82AZTHO8pgCA8aFDJJPVdfSdIV5pWK5htBnX2SMC+TZ9nNPLtLWcffQ==]
 site::profile::mysql_server::databases:
@@ -25,8 +21,8 @@ site::profile::ruby_passenger::projects:
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     passenger_user: mbvdserv
     passenger_app_env: stage
-    approot_owner: apache
     approot: /var/www/mbvd-service
+    approot_owner: apache
     ruby_version: 'ruby-2.2.5'
     directories:
       - directory_root:

diff --git a/customer/mbvd-service/web-mbvd-service-de.pixelpark.net.yaml b/customer/mbvd-service/web-mbvd-service-de.pixelpark.net.yaml
index 0318ed1af696107a1f2b95a706a9768f411e3766..adcb76909b0f9829d86082e594e11a3fc88719d2 100644 (file)
--- a/customer/mbvd-service/web-mbvd-service-de.pixelpark.net.yaml
+++ b/customer/mbvd-service/web-mbvd-service-de.pixelpark.net.yaml
@@ -22,6 +22,7 @@ site::profile::ruby_passenger::projects:
     passenger_user: mbvdserv
     passenger_app_env: live
     approot: /var/www/mbvd-service
+    approot_owner: apache
     ruby_version: 'ruby-2.2.5'
     directories:
       - directory_root: