Skip to content

Commit 8bdb8f6

Browse files
committed
Merge pull request puppetlabs#8 from mcanevet/postgresql__database_user
Use postgresql::database_user instead of postgresql::user in puppetdb::d...
2 parents b37281c + 7ea7252 commit 8bdb8f6

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

manifests/database/postgresql.pp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,11 @@
4141
) inherits puppetdb::params {
4242

4343

44-
::postgresql::user {$database_username:
45-
ensure => present,
46-
password => $database_password,
47-
superuser => false,
48-
createdb => false,
49-
createrole => false,
44+
::postgresql::database_user {$database_username:
45+
password_hash => postgresql_password($database_username, $database_password),
46+
superuser => false,
47+
createdb => false,
48+
createrole => false,
5049
}
5150

5251
::postgresql::database {$database_name:
@@ -55,7 +54,7 @@
5554
encoding => 'UTF8',
5655
template => 'template1',
5756
overwrite => false,
58-
require => Postgresql::User[$database_username],
57+
require => Postgresql::Database_user[$database_username],
5958
}
6059

6160
::postgresql::hba {'access to database puppetdb':

0 commit comments

Comments
 (0)