nominatim: reduce postgres archive time even more

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

diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb
index fa13948d876a8c1ce39875df72f17fffa52d11be..6f86f2064be94e066f02304eaf7d4a1a74459617 100644 (file)
--- a/cookbooks/web/recipes/backend.rb
+++ b/cookbooks/web/recipes/backend.rb
@@ -18,18 +18,24 @@
 #
 
 include_recipe "memcached"
 #
 
 include_recipe "memcached"

+include_recipe "apache::ssl"

 include_recipe "web::rails"
 include_recipe "web::cgimap"
 
 include_recipe "web::rails"
 include_recipe "web::cgimap"
 

-apache_module "fastcgi-handler"
+web_passwords = data_bag_item("web", "passwords")
+

 apache_module "remoteip"
 apache_module "remoteip"

+apache_module "rewrite"
+apache_module "proxy"
+apache_module "proxy_fcgi"

 
 apache_site "default" do
 
 apache_site "default" do

-  action [ :disable ]
+  action [:disable]

 end
 
 apache_site "www.openstreetmap.org" do
   template "apache.backend.erb"
 end
 
 apache_site "www.openstreetmap.org" do
   template "apache.backend.erb"

+  variables :secret_key_base => web_passwords["secret_key_base"]

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