X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/121252c9ad2a4debf5cd9189a46ee07ab0235923..9ea48dbd10bd416e75abfb8fc10eb1b1c8f11842:/cookbooks/web/recipes/backend.rb diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb index 38515b07a..69fb018d8 100644 --- 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 # -# 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, @@ -18,7 +18,7 @@ # include_recipe "memcached" -include_recipe "apache::ssl" +include_recipe "apache" include_recipe "web::rails" include_recipe "web::cgimap" @@ -36,7 +36,8 @@ end 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