Enable netplan for Scandinavian tile caches

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

diff --git a/cookbooks/web/recipes/frontend.rb b/cookbooks/web/recipes/frontend.rb
index 60b63eb2fc74892ec67b3dc53acabef53742e544..71a7c4384ac6e408b905f4db93c0558eeaad11f6 100644 (file)
--- a/cookbooks/web/recipes/frontend.rb
+++ b/cookbooks/web/recipes/frontend.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
 #
 # 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,50 +17,41 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
+include_recipe "apache"

 include_recipe "web::rails"
 
 web_passwords = data_bag_item("web", "passwords")
 
 apache_module "alias"
 include_recipe "web::rails"
 
 web_passwords = data_bag_item("web", "passwords")
 
 apache_module "alias"

-apache_module "deflate"

 apache_module "expires"
 apache_module "headers"
 apache_module "proxy_http"
 apache_module "proxy_balancer"
 apache_module "expires"
 apache_module "headers"
 apache_module "proxy_http"
 apache_module "proxy_balancer"

-if node[:lsb][:release].to_f >= 14.04
-  apache_module "lbmethod_bybusyness"
-end
+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
 
 apache_site "www.openstreetmap.org" do
   template "apache.frontend.erb"
 end
 
 apache_site "www.openstreetmap.org" do
   template "apache.frontend.erb"

-  variables :secret_key_base => web_passwords["secret_key_base"]
+  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
-end
-
-munin_plugin "api_calls_num" do
-  action :delete
-end
-
-munin_plugin "api_calls_#{node[:hostname]}" do
-  target "api_calls_"
+  mode 0o644

 end
 
 end
 

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

 end
 end