X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d281d02c1cc2a2608ae050735a2a277c76df1066..0ef75fc789f0cfe4d602b9c79d5f50c1293088fc:/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 d42408f9e..ad42b68f7 100644
--- a/cookbooks/dev/templates/default/rails.setup.rb.erb
+++ b/cookbooks/dev/templates/default/rails.setup.rb.erb
@@ -12,31 +12,43 @@ OpenStreetMap::Application.config.after_initialize do
     unless id = webmaster.client_applications.find_by_name("iD")
       id = webmaster.client_applications.new
       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
+    if Kernel.const_defined?("Settings")
+      Settings.id_key = id.key
+    else
+      ID_KEY = id.key
+    end
 
     unless potlatch = webmaster.client_applications.find_by_name("Potlatch 2")
       potlatch = webmaster.client_applications.new
       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
+    if Kernel.const_defined?("Settings")
+      Settings.potlatch2_key = potlatch.key
+    else
+      POTLATCH2_KEY = potlatch.key
+    end
 
     unless website = webmaster.client_applications.find_by_name("Web Site")
       website = webmaster.client_applications.new
       website.name = "Web Site"
-      website.url = "http://<%= @site %>/"
+      website.url = "https://<%= @site %>/"
       ClientApplication.all_permissions.each { |p| website[p] = true }
       website.save!
     end
 
-    OAUTH_KEY = website.key
+    if Kernel.const_defined?("Settings")
+      Settings.oauth_key = website.key
+    else
+      OAUTH_KEY = website.key
+    end
   end
 end