Merge remote-tracking branch 'github/pull/193'

[chef.git] / 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 b49dbff4be87252cac10e089c9c00328cd15f7be..1539fb7e69172a4fe5e8d4690d2454a5121b037e 100644 (file)
--- a/cookbooks/dev/templates/default/rails.setup.rb.erb
+++ b/cookbooks/dev/templates/default/rails.setup.rb.erb
@@ -1,5 +1,5 @@
-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.new
       webmaster.display_name = "OpenStreetMap Webmaster"
     unless webmaster = User.find_by_email("webmaster@openstreetmap.org")
       webmaster = User.new
       webmaster.display_name = "OpenStreetMap Webmaster"


@@ -9,30 +9,31 @@ unless Object.const_defined?(:Rake) or Object.const_defined?(:POTLATCH2_KEY)
       webmaster.save!
     end
 
       webmaster.save!
     end
 

-    permissions = Hash[ClientApplication.all_permissions.map { |p| [ p, true ] }]
-

     unless id = webmaster.client_applications.find_by_name("iD")
     unless id = webmaster.client_applications.find_by_name("iD")

-      id = ClientApplication.new
+      id = webmaster.client_applications.new

       id.name = "iD"
       id.name = "iD"

-      id.url = "http://<%= @site %>/"
+      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")
       id.save!
     end
 
     ID_KEY = id.key
 
     unless potlatch = webmaster.client_applications.find_by_name("Potlatch 2")

-      potlatch = ClientApplication.new
+      potlatch = webmaster.client_applications.new

       potlatch.name = "Potlatch 2"
       potlatch.name = "Potlatch 2"

-      potlatch.url = "http://<%= @site %>/"
+      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")
       potlatch.save!
     end
 
     POTLATCH2_KEY = potlatch.key
 
     unless website = webmaster.client_applications.find_by_name("Web Site")

-      website = ClientApplication.new
+      website = webmaster.client_applications.new

       website.name = "Web Site"
       website.name = "Web Site"

-      website.url = "http://<%= @site %>/"
+      website.url = "https://<%= @site %>/"
+      ClientApplication.all_permissions.each { |p| website[p] = true }

       website.save!
     end
 
       website.save!
     end