Merge pull request #8 from cprice-puppet/bug/master/dupe_in_db_ini

Fix duplicate stanza in database_ini.pp
This commit is contained in:
Chris Price 2012-09-20 17:10:33 -07:00
commit bbd1f3014d

View file

@ -77,10 +77,6 @@ class puppetdb::server::database_ini(
$subprotocol = 'postgresql' $subprotocol = 'postgresql'
$subname = "//${database_host}:${database_port}/${database_name}" $subname = "//${database_host}:${database_port}/${database_name}"
$classname = 'org.postgresql.Driver'
$subprotocol = 'postgresql'
$subname = "//${database_host}:${database_port}/${database}"
##Only setup for postgres ##Only setup for postgres
ini_setting {'puppetdb_psdatabase_username': ini_setting {'puppetdb_psdatabase_username':
setting => 'username', setting => 'username',