Merge pull request #6 from cprice-puppet/bug/master/db_ini_wrong_db_name

Bug/master/db ini wrong db name

Author: cprice404

CHANGELOG

@@ -1,2 +1,5 @@
+2012-09-19 - Chris Price <chris@puppetlabs.com>
+ * Fix invalid subname in database.ini (be683b7)
+
 2011-09-18 Chris Price <chris@puppetlabs.com> - 1.0.0
 * Initial 1.0.0 release

Modulefile

@@ -1,5 +1,5 @@
 name 'puppetlabs-puppetdb'
-version '1.0.0'
+version '1.0.1'
 source 'git://github.com/puppetlabs-puppet/puppetlabs-puppetdb.git'
 author 'Puppet Labs'
 description 'PuppetDB resource types'

manifests/server/database_ini.pp

@@ -73,7 +73,7 @@
   } elsif $database == 'postgres' {
       $classname = 'org.postgresql.Driver'
       $subprotocol = 'postgresql'
-      $subname = "//${database_host}:${database_port}/${database}"
+      $subname = "//${database_host}:${database_port}/${database_name}"
 
       ##Only setup for postgres
       ini_setting {'puppetdb_psdatabase_username':