Make the energy_perf_bias configuration actually work

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

diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index 8ed2db77b0fb4eaadd7c8b0f51233aed1b4d420c..ecfaea7efb55de325f3e986e1d275b225b1576d4 100644 (file)
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: web
+# Cookbook:: web

 # Recipe:: frontend
 #
 # Recipe:: frontend
 #

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,44 +17,75 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
+node.default[:memcached][:ip_address] = node.internal_ipaddress || "127.0.0.1"
+
+include_recipe "memcached"
+include_recipe "apache"

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

+include_recipe "web::cgimap"
+
+web_passwords = data_bag_item("web", "passwords")

 
 apache_module "alias"
 
 apache_module "alias"

-apache_module "deflate"

 apache_module "expires"
 apache_module "headers"
 apache_module "expires"
 apache_module "headers"

-apache_module "proxy_http"
-apache_module "proxy_balancer"
+apache_module "proxy"
+apache_module "proxy_fcgi"
+apache_module "lbmethod_byrequests"
+apache_module "lbmethod_bybusyness"

 apache_module "rewrite"
 apache_module "rewrite"

+apache_module "unique_id"

 
 apache_site "default" do
 
 apache_site "default" do

-  action [ :disable ]
+  action [:disable]
+end
+
+remote_directory "#{node[:web][:base_directory]}/static" do
+  source "static"
+  owner "root"
+  group "root"
+  mode "755"
+  files_owner "root"
+  files_group "root"
+  files_mode "644"

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

+  variables :status => node[:web][:status],
+            :secret_key_base => web_passwords["secret_key_base"]

 end
 
 end
 

-gem_package "hpricot"
-gem_package "home_run"
-gem_package "apachelogregex"
-

 template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
 template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode "644"

 end
 
 end
 

-munin_plugin "api_calls_num" do
-  action :delete
+service "rails-jobs@mailers" do
+  action [:enable, :start]
+  supports :restart => true
+  subscribes :restart, "rails_port[www.openstreetmap.org]"
+  subscribes :restart, "systemd_service[rails-jobs]"

 end
 
 end
 

-munin_plugin "api_calls_#{node[:hostname]}" do
-  target "api_calls_"
+service "rails-jobs@storage" do
+  action [:enable, :start]
+  supports :restart => true
+  subscribes :restart, "rails_port[www.openstreetmap.org]"
+  subscribes :restart, "systemd_service[rails-jobs]"

 end
 
 end
 

-munin_plugin "api_waits_#{node[:hostname]}" do
-  target "api_waits_"
+if node[:web][:primary_cluster]
+  service "rails-jobs@traces" do
+    action [:enable, :start]
+    supports :restart => true
+    subscribes :restart, "rails_port[www.openstreetmap.org]"
+    subscribes :restart, "systemd_service[rails-jobs]"
+  end
+else
+  service "rails-jobs@traces" do
+    action [:disable, :stop]
+  end

 end
 end