X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/faf8ae12e85eabb050b0f5eceb2cb67ad1de5261..681d1f66c97e97038a34e38f54ad4d78f154ac9a:/cookbooks/postgresql/providers/database.rb?ds=inline diff --git a/cookbooks/postgresql/providers/database.rb b/cookbooks/postgresql/providers/database.rb index eee79031d..9cf9dd442 100644 --- a/cookbooks/postgresql/providers/database.rb +++ b/cookbooks/postgresql/providers/database.rb @@ -26,13 +26,15 @@ def load_current_resource if pg_database = @pg.databases[@current_resource.database] @current_resource.owner(pg_database[:owner]) @current_resource.encoding(pg_database[:encoding]) + @current_resource.encoding(pg_database[:collate]) + @current_resource.encoding(pg_database[:ctype]) end @current_resource end action :create do unless @pg.databases.include?(new_resource.database) - @pg.execute(:command => "CREATE DATABASE #{new_resource.database} OWNER #{new_resource.owner} ENCODING '#{new_resource.encoding}'") + @pg.execute(:command => "CREATE DATABASE #{new_resource.database} OWNER #{new_resource.owner} TEMPLATE template0 ENCODING '#{new_resource.encoding}' LC_COLLATE '#{new_resource.collation}' LC_CTYPE '#{new_resource.ctype}'") new_resource.updated_by_last_action(true) else if new_resource.owner != @current_resource.owner