opuppet/module-postgresql
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #158 from harbulot/user_nopassword

Browse source 
Adding the ability to create users without a password.
This commit is contained in:
Ken Barber 2013-04-12 12:08:49 -07:00
commit 5e4045d0c9
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifests/database_user.pp
View file

@ -38,7 +38,7 @@
#
define postgresql::database_user(
$password_hash,
$password_hash = false,
$createdb = false,
$createrole = false,
$db = $postgresql::params::user,

9
manifests/role.pp
View file

@ -17,7 +17,7 @@
# limitations under the License.
define postgresql::role(
$password_hash,
$password_hash = false,
$createdb = false,
$createrole = false,
$db = 'postgres',
@ -40,9 +40,14 @@ define postgresql::role(
$createdb_sql = $createdb ? { true => 'CREATEDB' , default => 'NOCREATEDB' }
$superuser_sql = $superuser ? { true => 'SUPERUSER' , default => 'NOSUPERUSER' }
$replication_sql = $replication ? { true => 'REPLICATION' , default => '' }
if ($password_hash != false) {
$password_sql = "ENCRYPTED PASSWORD '${password_hash}'"
} else {
$password_sql = ""
}
# TODO: FIXME: Will not correct the superuser / createdb / createrole / login / replication status nor the connection limit of a role that already exists
postgresql_psql {"CREATE ROLE \"${username}\" ENCRYPTED PASSWORD '${password_hash}' ${login_sql} ${createrole_sql} ${createdb_sql} ${superuser_sql} ${replication_sql} CONNECTION LIMIT ${connection_limit}":
postgresql_psql {"CREATE ROLE \"${username}\" ${password_sql} ${login_sql} ${createrole_sql} ${createdb_sql} ${superuser_sql} ${replication_sql} CONNECTION LIMIT ${connection_limit}":
db => $db,
psql_user => $postgresql::params::user,
unless => "SELECT rolname FROM pg_roles WHERE rolname='${username}'",