X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/326a072ad0025a729806c9c9ab1d98effc65886a..9ea48dbd10bd416e75abfb8fc10eb1b1c8f11842:/cookbooks/web/recipes/backend.rb

diff --git a/cookbooks/web/recipes/backend.rb b/cookbooks/web/recipes/backend.rb
index 7dc229eeb..69fb018d8 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"
 
@@ -26,21 +26,18 @@ web_passwords = data_bag_item("web", "passwords")
 
 apache_module "remoteip"
 apache_module "rewrite"
-
-if node[:lsb][:release].to_f >= 14.04
-  apache_module "proxy"
-  apache_module "proxy_fcgi"
-else
-  apache_module "fastcgi-handler"
-end
+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"]
+  variables :status => node[:web][:status],
+            :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