added imgmagick for foty and removed k.tadesse user from serviceandsmile

diff --git a/customer/mbvd-familyoftheyear/common.yaml b/customer/mbvd-familyoftheyear/common.yaml
index efbbb55766c66d39ced83dd45121a3335d571302..1e1758645ab903e434891068b7aec8e7a3d56ee1 100644 (file)
--- a/customer/mbvd-familyoftheyear/common.yaml
+++ b/customer/mbvd-familyoftheyear/common.yaml
@@ -6,6 +6,9 @@ site::additional_classes:
   - site::profile::mysql_server
   - git
 
+site::additional_packages:
+  ImageMagick: {}
+
 accounts::users:
   deploy.hamburg:
     uid: 60201

diff --git a/customer/mbvd-familyoftheyear/www-familyoftheyear-de.pixelpark.net.yaml b/customer/mbvd-familyoftheyear/www-familyoftheyear-de.pixelpark.net.yaml
index b3545c4214a0ccfdffb0d4dbe5489e57c26d5a00..0f6e0ba99b730a9946cd842fa17edfa3a8a51299 100644 (file)
--- a/customer/mbvd-familyoftheyear/www-familyoftheyear-de.pixelpark.net.yaml
+++ b/customer/mbvd-familyoftheyear/www-familyoftheyear-de.pixelpark.net.yaml
@@ -13,7 +13,7 @@ site::profile::apache::htdigest:
 site::profile::ruby_passenger::projects:
   family:
     servername: www-familyoftheyear-de.pixelpark.net
-    serveraliases:
+    serveraliases: 
       - vip-www-familyoftheyear-de.pixelpark.net
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'

diff --git a/customer/mbvd-service-and-smile/common.yaml b/customer/mbvd-service-and-smile/common.yaml
index 4b47645f1d988a8c6603054231fe29380586df3a..15ab7fe858e2cec1b4deb3ad6f5151aa20feb1e6 100644 (file)
--- a/customer/mbvd-service-and-smile/common.yaml
+++ b/customer/mbvd-service-and-smile/common.yaml
@@ -16,9 +16,6 @@ php::settings:
   PHP/expose_php: 'Off'
 
 accounts::users:
-  konrad.tadesse:
-    apply: true
-    group: "apache"
   andreas.pinto-koehler:
     apply: true
     group: "apache"
@@ -27,8 +24,8 @@ accounts::users:
     group: "apache"
   thomas.bussmeyer:
     apply: true
-    group: "apache"   
+    group: "apache"
   deploy.vogel:
     apply: true
     sudo: true
-    group: "apache"
\ No newline at end of file
+    group: "apache"