Skip to content

Bug/master/db ini wrong db name #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cprice404 merged 2 commits into from
Sep 20, 2012
Merged

Bug/master/db ini wrong db name #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be683b7
Fix invalid subname in database.ini
cprice404 Sep 19, 2012
7c81036
Update CHANGELOG and Modulefile
cprice404 Sep 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Modulefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion manifests/server/database_ini.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down
⚡