X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0689c09ff5ec373c978c55abb058f4dfdee6ada6..204605749875101d3316aa94917d0a4b6c055fb3:/cookbooks/web/recipes/backend.rb diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb index b059d4f44..afc852c00 100644 --- a/cookbooks/web/recipes/backend.rb +++ b/cookbooks/web/recipes/backend.rb @@ -18,18 +18,20 @@ # include_recipe "memcached" -include_recipe "apache::ssl" +include_recipe "apache" include_recipe "web::rails" include_recipe "web::cgimap" web_passwords = data_bag_item("web", "passwords") -apache_module "fastcgi-handler" 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 @@ -37,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