getting rid of /etc/grafana/ldap.toml hardcode

I would like to avoid hardcode paths, voxpupuli#257
olevole · Sep 15, 2021 · fe229c2 · fe229c2
1 parent 652c739
commit fe229c2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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,