Revert "Correct paths to tftp root directory"

[chef.git] / cookbooks / web / recipes / rails.rb

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index 9956f099c65ad1fa25bdba5b8d49cbd92f26a1bc..7bd00e0b9bb4956a6898abfb4aa287c28bdea93a 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -91,6 +91,7 @@ rails_port "www.openstreetmap.org" do
   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]
   oauth_key web_passwords["oauth_key"]
   potlatch2_key web_passwords["potlatch2_key"]
   id_key web_passwords["id_key"]
   oauth_key web_passwords["oauth_key"]

+  oauth_application web_passwords["oauth_application"]

   piwik_configuration "location" => piwik[:location],
                       "site" => piwik[:site],
                       "goals" => piwik[:goals].to_hash
   piwik_configuration "location" => piwik[:location],
                       "site" => piwik[:site],
                       "goals" => piwik[:goals].to_hash


@@ -113,6 +114,7 @@ rails_port "www.openstreetmap.org" do
   storage_configuration storage
   storage_service "avatars"
   storage_url "https://openstreetmap-user-avatars.s3.dualstack.eu-west-1.amazonaws.com"
   storage_configuration storage
   storage_service "avatars"
   storage_url "https://openstreetmap-user-avatars.s3.dualstack.eu-west-1.amazonaws.com"

+  overpass_url "https://query.openstreetmap.org/query-features"

 end
 
 gem_package "bundler#{ruby_version}" do
 end
 
 gem_package "bundler#{ruby_version}" do