From fe229c2e8b4963a105921955752888ca3a4d2625 Mon Sep 17 00:00:00 2001
From: olevole <olevole@olevole.ru>
Date: Wed, 15 Sep 2021 21:13:59 +0300
Subject: [PATCH] getting rid of /etc/grafana/ldap.toml hardcode

I would like to avoid hardcode paths, #257
---
 data/common.yaml    | 1 +
 manifests/config.pp | 2 +-
 manifests/init.pp   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/common.yaml b/data/common.yaml
index 28bb0ac10..0db604546 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -3,6 +3,7 @@ grafana::archive_source: ~
 grafana::cfg_location: '/etc/grafana/grafana.ini'
 grafana::cfg: {}
 grafana::ldap_cfg: ~
+grafana::ldap_cfg_location: '/etc/grafana/ldap.toml'
 grafana::container_cfg: false
 grafana::container_params: {}
 grafana::docker_image: 'grafana/grafana'
diff --git a/manifests/config.pp b/manifests/config.pp
index 341269f14..f593701d2 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -91,7 +91,7 @@
 
     $ldap_cfg_toml = inline_template($template_body.join(''))
 
-    file { '/etc/grafana/ldap.toml':
+    file { $grafana::ldap_cfg_location:
       ensure  => file,
       content => $ldap_cfg_toml,
       owner   => 'grafana',
diff --git a/manifests/init.pp b/manifests/init.pp
index 69a455293..50e85d2f4 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -138,6 +138,7 @@
   String $cfg_location,
   Hash $cfg,
   Optional[Variant[Hash,Array]] $ldap_cfg,
+  Stdlib::Absolutepath $ldap_cfg_location,
   Boolean $container_cfg,
   Hash $container_params,
   String $docker_image,