From 0065b6a1b067390be487386f588c8d98dc87e366 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@sevenseas.org>
Date: Fri, 18 Mar 2016 17:01:13 +0100
Subject: [PATCH] 
 d4science-ghn-cluster/roles/nginx-frontend/templates/dataminer1-d-d4s.d4science.org-virtualhost.j2:
 Modify the log format to be http compliant.
 library/roles/mysql/tasks/manage_my_db.yml: Manage additional grant
 privileges. library/vars/isti-global.yml: Add the IP of
 analytics.d4science.org.

---
 mysql/tasks/manage_my_db.yml | 12 +++++++++++-
 piwik/defaults/main.yml      |  2 ++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/mysql/tasks/manage_my_db.yml b/mysql/tasks/manage_my_db.yml
index 35f9a8c..fe4de4a 100644
--- a/mysql/tasks/manage_my_db.yml
+++ b/mysql/tasks/manage_my_db.yml
@@ -11,4 +11,14 @@
     - '{{ mysql_db_data | default([]) }}'
     - allowed_hosts
   when: item.0.name is defined
-  tags: [ 'mysql', 'mysql_db' ]
+  tags: [ 'mysql', 'mysql_db', 'mysql_user' ]
+
+- name: Additional user privileges, if defined
+  mysql_user: name={{ item.0.user }} append_privs=yes priv="{{ item.0.name }}.*:{{ item.0.additional_privs }}" state=present
+  with_subelements:
+    - '{{ mysql_db_data | default([]) }}'
+    - allowed_hosts
+  when:
+    - item.0.name is defined
+    - item.0.additional_privs is defined
+  tags: [ 'mysql', 'mysql_db', 'mysql_user' ]
diff --git a/piwik/defaults/main.yml b/piwik/defaults/main.yml
index 14ea16f..f14840b 100644
--- a/piwik/defaults/main.yml
+++ b/piwik/defaults/main.yml
@@ -20,4 +20,6 @@ piwik_pkgs:
   - php5-json
   - php5-ldap
   - php5-gd
+  - php5-redis
+