Update default SSL cipher list and remove tilecache override

[chef.git] / cookbooks / postgresql / providers / database.rb

diff --git a/cookbooks/postgresql/providers/database.rb b/cookbooks/postgresql/providers/database.rb
index 31704314be414ecd1f12e77a7ce27e97a6221e60..998d2bed3bb55f550fbe9be88c8df99144fd6792 100644 (file)
--- a/cookbooks/postgresql/providers/database.rb
+++ b/cookbooks/postgresql/providers/database.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+use_inline_resources
+
 def load_current_resource
   @pg = Chef::PostgreSQL.new(new_resource.cluster)
 
@@ -36,11 +38,9 @@ action :create do
   if !@pg.databases.include?(new_resource.database)
     @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
-      @pg.execute(:command => "ALTER DATABASE \"#{new_resource.database}\" OWNER TO \"#{new_resource.owner}\"")
-      new_resource.updated_by_last_action(true)
-    end
+  elsif new_resource.owner != @current_resource.owner
+    @pg.execute(:command => "ALTER DATABASE \"#{new_resource.database}\" OWNER TO \"#{new_resource.owner}\"")
+    new_resource.updated_by_last_action(true)
   end
 end