X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/11d0975caf6d12fb54162b81a554e1b6c1e6317a..83ae724313a707e470a7ea6328cf0c4225cc2121:/cookbooks/web/recipes/backend.rb

diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb
index 6898b42be..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,20 +18,25 @@
 #
 
 include_recipe "memcached"
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "web::rails"
 include_recipe "web::cgimap"
 
-apache_module "fastcgi-handler"
+web_passwords = data_bag_item("web", "passwords")
+
 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
   template "apache.backend.erb"
+  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