From: Thomas Heller <thomas.heller@pixelpark.com>
Date: Thu, 10 Mar 2016 15:35:28 +0000 (+0100)
Subject: added imgmagick for foty and removed k.tadesse user from serviceandsmile
X-Git-Tag: v0.1.0~5153^2
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=14dd91f937d45854e3c933c03c598f007e15ce58;p=pixelpark%2Fhiera.git

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 efbbb557..1e175864 100644
--- 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 b3545c42..0f6e0ba9 100644
--- 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 4b47645f..15ab7fe8 100644
--- 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"