From 8c79aa4e1a78e86b7f404666d431a03647b7db26 Mon Sep 17 00:00:00 2001
From: Guillaume Thouvenin <gthouvenin@mirantis.com>
Date: Tue, 13 Dec 2016 13:53:05 +0100
Subject: [PATCH] Allow the configuration of servers attributes

---
 grafana/files/ldap.toml | 10 +++++-----
 grafana/map.jinja       |  7 +++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/grafana/files/ldap.toml b/grafana/files/ldap.toml
index ff5fb6e..0190ea2 100644
--- a/grafana/files/ldap.toml
+++ b/grafana/files/ldap.toml
@@ -70,11 +70,11 @@ group_search_base_dns = {{ ldap_params.group_search_base_dns }}
 {%- endif %}
 
 [servers.attributes]
-name = "givenName"
-surname = "sn"
-username = "cn"
-member_of = "memberOf"
-email =  "email"
+name      = "{{ ldap_params.servers.attributes.name }}"
+surname   = "{{ ldap_params.servers.attributes.surname }}"
+username  = "{{ ldap_params.servers.attributes.username }}"
+member_of = "{{ ldap_params.servers.attributes.member_of }}"
+email     = "{{ ldap_params.servers.attributes.email }}"
 
 {%- if ldap_params.get('authorization', {}).get('enabled', False) %}
 
diff --git a/grafana/map.jinja b/grafana/map.jinja
index 4c9fe60..2b38de3 100644
--- a/grafana/map.jinja
+++ b/grafana/map.jinja
@@ -21,6 +21,13 @@ Debian:
       user_search_filter: "(cn=%s)"
       user_search_base_dns:
       - "dc=grafana,dc=org"
+      servers:
+        attributes:
+          name: "givenName"
+          surname: "sn"
+          username: "cn"
+          member_of: "memberOf"
+          email: "email"
   admin:
     user: admin
     password: admin