X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3acb5c42fb0b3963eafa4e542d11b2a48b99cefc..66c8810de3626826ca758bf47b0def637254c97c:/cookbooks/web/recipes/backend.rb diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb index df22c123d..afc852c00 100644 --- a/cookbooks/web/recipes/backend.rb +++ b/cookbooks/web/recipes/backend.rb @@ -18,7 +18,7 @@ # include_recipe "memcached" -include_recipe "apache::ssl" +include_recipe "apache" include_recipe "web::rails" include_recipe "web::cgimap" @@ -28,9 +28,10 @@ apache_module "remoteip" apache_module "rewrite" apache_module "proxy" apache_module "proxy_fcgi" +apache_module "setenvif" apache_site "default" do - action [ :disable ] + action [:disable] end apache_site "www.openstreetmap.org" do @@ -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