mbvd-bannershop - Make Puppet happy

diff --git a/customer/mbvd-bannershop/common.yaml b/customer/mbvd-bannershop/common.yaml
index 93524e3986e98aade4f697030aca6846cc0a415d..42bac40b163a46e19511d394def876e2eaa297a3 100644 (file)
--- a/customer/mbvd-bannershop/common.yaml
+++ b/customer/mbvd-bannershop/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
 
 site::additional_packages:
   ImageMagick: {}

diff --git a/customer/mbvd-bannershop/stage-web-bannershop-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-bannershop/stage-web-bannershop-mercedes-benz-de.pixelpark.net.yaml
index 5679fd8b8fa61aa807144780896a07b5fea3e7df..4de8f71341579aecbd9c1fd05ca60f8d41cf2acf 100644 (file)
--- a/customer/mbvd-bannershop/stage-web-bannershop-mercedes-benz-de.pixelpark.net.yaml
+++ b/customer/mbvd-bannershop/stage-web-bannershop-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,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAKyB3Zv0YMmkJlF5mMECCT7XZ/TJQjYOQ+55z0Ytgcih727zsndwbJwd50A5rlolu5KbL2daOpeSqjGEbgDAB/gElRysBpCNog+U3o7EhF9mLqZ4Kns/om+6qKXgo3gk7pFMYNQLJ/3/JByar4oGG6RhJP7lN8MlujbKjosZwgcppCfszQULhjFDkb8erb273PDi2wsD/2BMByuSMfPXjDrLtW5NxPA4DpQyjgDKlgiQ9ICnaM1YT7AdnobPTTpf+wisyLIfZ6wBhKe9mAnjzeDgwL0IFib8WweUNcToGhrg2G393hZoz7qszQcXfdSCCoQILTjMGtG99Z/Fs0qh90jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBApPC27O3Mz2peR33Df6jk7gCCxZ7I0CqKx1qsaxczOVAdZsQB2KXriLa1J682e4xNm7A==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHWDNSojARlmG0uoqSljXUNhvbUtxVDEci2y1zYSw+LwZOkcuJNdkNfLoJAeIMQX+jPB0WlgLG/ydmBRauJWb3uhU7gVZQU83qrdtZhTryMLc4DulolmlYX1IKLfSztKxsGiGOJncEcvnWCiIq4Yq4/Nc9dZ7Bz2Gtc/s098sJ7988ycaUWvBYU9O2j5rDClq2VxPd3BHlE7JnMwpag79sWIjPzVLyBf6oZ4ZozrMheW9R1oCpFfGeaxye1nt2sKf1i3yBkfKlk4hXPD6zE7dinO4sSj7R0HvFqmBn6lFh1JR6GWNESsUIkxAssyaS/CHdfAYjcY2wdwUocp0oclaqTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCBPrbYeoIkComd9YAol0WegCDmSSPCSfN2Q1K5faM+GzmeysiOGmxThOIRKh1RZpMXCA==]
 site::profile::mysql_server::databases:

diff --git a/customer/mbvd-bannershop/web-bannershop-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-bannershop/web-bannershop-mercedes-benz-de.pixelpark.net.yaml
index 30223261369c48253dc668b4d6ab406881dcb81a..08f13e2fd2811f6da0053becc53024b9e1d73228 100644 (file)
--- a/customer/mbvd-bannershop/web-bannershop-mercedes-benz-de.pixelpark.net.yaml
+++ b/customer/mbvd-bannershop/web-bannershop-mercedes-benz-de.pixelpark.net.yaml
@@ -17,6 +17,7 @@ site::profile::ruby_passenger::projects:
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     passenger_user: banner
     passenger_app_env: live
+    approot_owner: apache
     approot: /var/www/bannershop
     ruby_version: 'ruby-2.2.5'
     access_log_format: urchinpp_xf4