grafana: minor fixes again

playbooks/grafana.yml

@@ -17,8 +17,9 @@
         bind_password: "{{ vault_ldap_grafana_password }}"
         search_base_dns: "cn=Utilisateurs,dc=auro,dc=re"
         group_search_base_dns: "ou=posix,ou=groups,dc=auro,dc=re"
-        editors_group_dn:
+        admins_group_dn:
           - cn=sudoldap,ou=posix,ou=groups,dc=auro,dc=re
+        editors_group_dn:
           - cn=technicien,ou=posix,ou=groups,dc=auro,dc=re
     update_motd:
       grafana: Grafana est déployé (/etc/grafana).

roles/grafana/tasks/main.yml

@@ -19,7 +19,7 @@
     uris: https://apt.grafana.com
     suites: stable
     components: main
-    signed_by: /usr/share/keyrings/grafana-release-keyring.gpg
+    signed_by: /etc/apt/keyrings/grafana-release-keyring.asc
 
 - name: Install Grafana
   apt:

roles/grafana/templates/ldap.toml.j2

@@ -46,8 +46,15 @@ username = "cn"
 member_of = "dn"
 email =  "mail"
 
+# Admins
+{% for group_dn in grafana.ldap.admins_group_dn | default([]) %}
+[[servers.group_mappings]]
+group_dn = "{{ group_dn }}"
+org_role = "Admin"
+{% endfor %}
+
 # Editors
-{% for group_dn in grafana.ldap.editors_group_dn %}
+{% for group_dn in grafana.ldap.editors_group_dn | default([]) %}
 [[servers.group_mappings]]
 group_dn = "{{ group_dn }}"
 org_role = "Editor"