From f5a232f3a756694062b8a3a465e97129cea8b7cf Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Fri, 12 Sep 2014 19:08:01 +0200
Subject: [PATCH] Update 'resources.ini'

refs #6842
---
 .../files/etc/icingaweb/resources.ini         | 56 ++++++++-----------
 packages/rpm/etc/icingaweb/resources.ini      | 50 ++++++++---------
 2 files changed, 48 insertions(+), 58 deletions(-)

diff --git a/.vagrant-puppet/files/etc/icingaweb/resources.ini b/.vagrant-puppet/files/etc/icingaweb/resources.ini
index 3935906eb..ac6c6a03c 100644
--- a/.vagrant-puppet/files/etc/icingaweb/resources.ini
+++ b/.vagrant-puppet/files/etc/icingaweb/resources.ini
@@ -1,34 +1,26 @@
-[internal_db]
-type                = db
-db                  = mysql
-host                = localhost
-port                = 3306
-password            = icingaweb
-username            = icingaweb
-dbname              = icingaweb
+[icingaweb-mysql]
+type        = db
+db          = mysql
+host        = localhost
+port        = 3306
+password    = icingaweb
+username    = icingaweb
+dbname      = icingaweb
+
+[icingaweb-pgsql]
+type        = db
+db          = pgsql
+host        = localhost
+port        = 5432
+password    = icingaweb
+username    = icingaweb
+dbname      = icingaweb
 
 [ido]
-type                = db
-db                  = mysql
-host                = localhost
-port                = 3306
-password            = icinga2
-username            = icinga2
-dbname              = icinga2
-
-[statusdat]
-type                = statusdat
-status_file         = /usr/local/icinga-mysql/var/status.dat
-object_file         = /usr/local/icinga-mysql/var/objects.cache
-
-[livestatus]
-type                = livestatus
-socket              = /usr/local/icinga-mysql/var/rw/live
-
-[internal_ldap]
-type                = ldap
-hostname            = localhost
-port                = 389
-root_dn             = "ou=people, dc=icinga, dc=org"
-bind_dn             = "cn=admin,cn=config"
-bind_pw             = admin
+type        = db
+db          = mysql
+host        = localhost
+port        = 3306
+password    = icinga2
+username    = icinga2
+dbname      = icinga2
diff --git a/packages/rpm/etc/icingaweb/resources.ini b/packages/rpm/etc/icingaweb/resources.ini
index 1c1e62eb1..ac6c6a03c 100644
--- a/packages/rpm/etc/icingaweb/resources.ini
+++ b/packages/rpm/etc/icingaweb/resources.ini
@@ -1,28 +1,26 @@
-[internal_db]
-type                = db
-db                  = mysql
-host                = localhost
-port                = 3306
-password            = icingaweb
-username            = icingaweb
-dbname              = icingaweb
+[icingaweb-mysql]
+type        = db
+db          = mysql
+host        = localhost
+port        = 3306
+password    = icingaweb
+username    = icingaweb
+dbname      = icingaweb
+
+[icingaweb-pgsql]
+type        = db
+db          = pgsql
+host        = localhost
+port        = 5432
+password    = icingaweb
+username    = icingaweb
+dbname      = icingaweb
 
 [ido]
-type                = db
-db                  = mysql
-host                = localhost
-port                = 3306
-password            = icinga
-username            = icinga
-dbname              = icinga
-
-[livestatus]
-type                = livestatus
-socket              = /var/run/icinga2/cmd/livestatus
-
-[logfile]
-type                = file
-filename            = "/var/log/icingaweb/icingaweb.log"
-fields              = "/^(?<datetime>[0-9]{4}(-[0-9]{2}){2}T[0-9]{2}(:[0-9]{2}){2}(\\+[0-9]{2}:[0-9]{2})?) - (?<loglevel>[A-Za-z]+) - (?<message>.*)$/"
-; format: PCRE
-;
+type        = db
+db          = mysql
+host        = localhost
+port        = 3306
+password    = icinga2
+username    = icinga2
+dbname      = icinga2