From 6974b18755f244229114e8b248f439d3ec930bbe Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Mon, 15 Dec 2014 10:54:56 +0100
Subject: [PATCH] puppet: Use hiera variables in the resources.ini template

refs #6842
---
 .../icingaweb2_dev/templates/resources.ini.erb   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.puppet/profiles/icingaweb2_dev/templates/resources.ini.erb b/.puppet/profiles/icingaweb2_dev/templates/resources.ini.erb
index e76afab41..8066a47a5 100644
--- a/.puppet/profiles/icingaweb2_dev/templates/resources.ini.erb
+++ b/.puppet/profiles/icingaweb2_dev/templates/resources.ini.erb
@@ -3,18 +3,18 @@ type        = db
 db          = mysql
 host        = localhost
 port        = 3306
-password    = icingaweb
-username    = icingaweb
-dbname      = icingaweb
+username    = <%= @db_user %>
+password    = <%= @db_pass %>
+dbname      = <%= @db_name %>
 
 [icingaweb-pgsql]
 type        = db
 db          = pgsql
 host        = localhost
 port        = 5432
-password    = icingaweb
-username    = icingaweb
-dbname      = icingaweb
+username    = <%= @db_user %>
+password    = <%= @db_pass %>
+dbname      = <%= @db_name %>
 
 [ido-mysql]
 type        = db
@@ -34,10 +34,10 @@ password    = icinga2
 username    = icinga2
 dbname      = icinga2
 
-[internal_ldap]
+[local-ldap]
 type        = ldap
 hostname    = localhost
 port        = 389
-root_dn     = "ou=people, dc=icinga, dc=org"
+root_dn     = "ou=people,dc=icinga,dc=org"
 bind_dn     = "cn=admin,cn=config"
 bind_pw     = admin