Add support for configuring rails using settings.local.yml

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

diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb
index afc852c00772dee772952437715ec2712c3a1ea9..69fb018d87760ed7df96e6f0a62f1e42ad985af1 100644 (file)
--- a/cookbooks/web/recipes/backend.rb
+++ b/cookbooks/web/recipes/backend.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -36,7 +36,8 @@ end
 
 apache_site "www.openstreetmap.org" do
   template "apache.backend.erb"
 
 apache_site "www.openstreetmap.org" do
   template "apache.backend.erb"

-  variables :secret_key_base => web_passwords["secret_key_base"]
+  variables :status => node[:web][:status],
+            :secret_key_base => web_passwords["secret_key_base"]

 end
 
 node.normal[:memcached][:ip_address] = node.internal_ipaddress
 end
 
 node.normal[:memcached][:ip_address] = node.internal_ipaddress