X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/faf8ae12e85eabb050b0f5eceb2cb67ad1de5261..d58406548fa7bfd73c181dc9c97081e87e3f7d20:/cookbooks/postgresql/providers/user.rb diff --git a/cookbooks/postgresql/providers/user.rb b/cookbooks/postgresql/providers/user.rb index 11c783e22..5a1402d40 100644 --- a/cookbooks/postgresql/providers/user.rb +++ b/cookbooks/postgresql/providers/user.rb @@ -17,13 +17,15 @@ # limitations under the License. # +use_inline_resources + def load_current_resource @pg = Chef::PostgreSQL.new(new_resource.cluster) @current_resource = Chef::Resource::PostgresqlUser.new(new_resource.name) @current_resource.user(new_resource.user) @current_resource.cluster(new_resource.cluster) - if pg_user = @pg.users[@current_resource.user] + if (pg_user = @pg.users[@current_resource.user]) @current_resource.superuser(pg_user[:superuser]) @current_resource.createdb(pg_user[:createdb]) @current_resource.createrole(pg_user[:createrole]) @@ -39,7 +41,7 @@ action :create do createrole = new_resource.createrole ? "CREATEROLE" : "NOCREATEROLE" replication = new_resource.replication ? "REPLICATION" : "NOREPLICATION" - unless @pg.users.include?(new_resource.user) + if !@pg.users.include?(new_resource.user) @pg.execute(:command => "CREATE ROLE \"#{new_resource.user}\" LOGIN #{password} #{superuser} #{createdb} #{createrole}") new_resource.updated_by_last_action(true) else