X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/21958591555b0b80370e944e3128ac5d533c281d..18e12b0e123fc3e5f344682f884feabc12da0f5a:/cookbooks/web/recipes/backend.rb diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb index 6f86f2064..0bc88cea7 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" @@ -28,6 +28,7 @@ apache_module "remoteip" apache_module "rewrite" apache_module "proxy" apache_module "proxy_fcgi" +apache_module "setenvif" apache_site "default" do action [:disable] @@ -38,4 +39,4 @@ apache_site "www.openstreetmap.org" do variables :secret_key_base => web_passwords["secret_key_base"] end -node.set[:memcached][:ip_address] = node.internal_ipaddress +node.normal[:memcached][:ip_address] = node.internal_ipaddress