X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/1c848471a16f9d1ee1fc8a327af110447ea1ef4c..ea65a185d043709670b7087fe3f6d58797fe48ee:/cookbooks/dev/templates/default/rails.setup.rb.erb

diff --git a/cookbooks/dev/templates/default/rails.setup.rb.erb b/cookbooks/dev/templates/default/rails.setup.rb.erb
index 269ac4355..1539fb7e6 100644
--- a/cookbooks/dev/templates/default/rails.setup.rb.erb
+++ b/cookbooks/dev/templates/default/rails.setup.rb.erb
@@ -1,39 +1,40 @@
-unless Object.const_defined?(:Rake) or Object.const_defined?(:POTLATCH2_KEY)
-  OpenStreetMap::Application.config.after_initialize do
+OpenStreetMap::Application.config.after_initialize do
+  if ActiveRecord::Base.connection.table_exists?(:client_applications)
     unless webmaster = User.find_by_email("webmaster@openstreetmap.org")
-      webmaster = User.create({
-        :display_name => "OpenStreetMap Webmaster",
-        :email => "webmaster@openstreetmap.org",
-        :pass_crypt => SecureRandom.hex,
-        :status => "active"
-      }, :without_protection => true)
+      webmaster = User.new
+      webmaster.display_name = "OpenStreetMap Webmaster"
+      webmaster.email = "webmaster@openstreetmap.org"
+      webmaster.pass_crypt = SecureRandom.hex
+      webmaster.status = "active"
+      webmaster.save!
     end
 
-    permissions = Hash[ClientApplication.all_permissions.map { |p| [ p, true ] }]
-
     unless id = webmaster.client_applications.find_by_name("iD")
-      id = ClientApplication.create(permissions.merge({
-        :name => "iD",
-        :url => "http://<%= @site %>/",
-      }), :without_protection => true)
+      id = webmaster.client_applications.new
+      id.name = "iD"
+      id.url = "https://<%= @site %>/"
+      ClientApplication.all_permissions.each { |p| id[p] = true }
+      id.save!
     end
 
     ID_KEY = id.key
 
     unless potlatch = webmaster.client_applications.find_by_name("Potlatch 2")
-      potlatch = ClientApplication.create(permissions.merge({
-        :name => "Potlatch 2",
-        :url => "http://<%= @site %>/",
-      }), :without_protection => true)
+      potlatch = webmaster.client_applications.new
+      potlatch.name = "Potlatch 2"
+      potlatch.url = "https://<%= @site %>/"
+      ClientApplication.all_permissions.each { |p| potlatch[p] = true }
+      potlatch.save!
     end
 
     POTLATCH2_KEY = potlatch.key
 
     unless website = webmaster.client_applications.find_by_name("Web Site")
-      website = ClientApplication.create(permissions.merge({
-        :name => "Web Site",
-        :url => "http://<%= @site %>/",
-      }), :without_protection => true)
+      website = webmaster.client_applications.new
+      website.name = "Web Site"
+      website.url = "https://<%= @site %>/"
+      ClientApplication.all_permissions.each { |p| website[p] = true }
+      website.save!
     end
 
     OAUTH_KEY = website.key