From: Tom Hughes <tom@compton.nu>
Date: Fri, 17 May 2019 18:37:47 +0000 (+0100)
Subject: Teach dev instance setup script to handle new style configuration
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/7c138bff74e0ccc03bcb662bfbe752b3fca68c37

Teach dev instance setup script to handle new style configuration
---

diff --git a/cookbooks/dev/templates/default/rails.setup.rb.erb b/cookbooks/dev/templates/default/rails.setup.rb.erb
index 1539fb7e6..ad42b68f7 100644
--- a/cookbooks/dev/templates/default/rails.setup.rb.erb
+++ b/cookbooks/dev/templates/default/rails.setup.rb.erb
@@ -17,7 +17,11 @@ OpenStreetMap::Application.config.after_initialize do
       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
@@ -27,7 +31,11 @@ OpenStreetMap::Application.config.after_initialize do
       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
@@ -37,6 +45,10 @@ OpenStreetMap::Application.config.after_initialize do
       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