tilecache: only rate limit clients not peers

[chef.git] / cookbooks / taginfo / recipes / default.rb

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 288f39a96d98f777e299ab1389f72bf1ad07d78e..567d81a0e17f5483c99262b7e3d1bbbff0b685cb 100644 (file)
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: taginfo
+# Cookbook:: taginfo
 # Recipe:: default
 #
-# Copyright 2014, OpenStreetMap Foundation
+# Copyright:: 2014, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 
 require "json"
 
+include_recipe "accounts"
 include_recipe "apache"
 include_recipe "passenger"
 include_recipe "git"
@@ -33,6 +34,8 @@ package %w[
   libgd-dev
   libicu-dev
   libboost-program-options-dev
+  libosmium2-dev
+  libprotozero-dev
   cmake
   make
   g++
@@ -40,6 +43,7 @@ package %w[
 
 package %w[
   sqlite3
+  osmium-tool
   pyosmium
   curl
   pbzip2
@@ -51,6 +55,7 @@ package "ruby#{ruby_version}"
 
 gem_package "bundler#{ruby_version}" do
   package_name "bundler"
+  version "~> 1.16.2"
   gem_binary "gem#{ruby_version}"
   options "--format-executable"
 end
@@ -59,23 +64,12 @@ apache_module "cache"
 apache_module "cache_disk"
 apache_module "headers"
 
-template "/etc/cron.d/taginfo" do
-  source "cron.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-end
-
 directory "/var/log/taginfo" do
   owner "taginfo"
   group "taginfo"
   mode 0o755
 end
 
-file "/etc/logrotate.d/taginfo" do
-  action :delete
-end
-
 template "/etc/sudoers.d/taginfo" do
   source "sudoers.erb"
   owner "root"
@@ -104,26 +98,11 @@ node[:taginfo][:sites].each do |site|
     mode 0o755
   end
 
-  git "#{directory}/libosmium" do
-    action :sync
-    repository "git://github.com/osmcode/libosmium.git"
-    revision "v2.12.1"
-    user "taginfo"
-    group "taginfo"
-  end
-
-  git "#{directory}/osmium-tool" do
-    action :sync
-    repository "git://github.com/osmcode/osmium-tool.git"
-    revision "v1.6.1"
-    user "taginfo"
-    group "taginfo"
-  end
-
   git "#{directory}/taginfo" do
     action :sync
-    repository "git://github.com/taginfo/taginfo.git"
+    repository "https://github.com/taginfo/taginfo.git"
     revision "osmorg-taginfo-live"
+    depth 1
     user "taginfo"
     group "taginfo"
   end
@@ -142,9 +121,8 @@ node[:taginfo][:sites].each do |site|
     settings["opensearch"]["contact"] = "webmaster@openstreetmap.org"
     settings["sources"]["download"] = ""
     settings["sources"]["create"] = "db languages projects wiki"
-    settings["sources"]["db"]["planetfile"] = "#{directory}/planet/planet.pbf"
+    settings["sources"]["db"]["planetfile"] = "/var/lib/planet/planet.pbf"
     settings["sources"]["db"]["bindir"] = "#{directory}/taginfo/tagstats"
-    settings["tagstats"]["cxxflags"] = "-I../../libosmium/include"
     settings["tagstats"]["geodistribution"] = "DenseMmapArray"
 
     JSON.pretty_generate(settings)
@@ -164,27 +142,12 @@ node[:taginfo][:sites].each do |site|
     cwd "#{directory}/taginfo/tagstats"
     user "taginfo"
     group "taginfo"
-    subscribes :run, "git[#{directory}/libosmium]"
+    subscribes :run, "apt_package[libprotozero-dev]"
+    subscribes :run, "apt_package[libosmium2-dev]"
     subscribes :run, "git[#{directory}/taginfo]"
     notifies :restart, "service[apache2]"
   end
 
-  directory "#{directory}/osmium-tool/build" do
-    owner "taginfo"
-    group "taginfo"
-    mode "0755"
-  end
-
-  execute "compile-osmium" do
-    action :nothing
-    command "cmake .. && make"
-    cwd "#{directory}/osmium-tool/build"
-    user "taginfo"
-    group "taginfo"
-    subscribes :run, "git[#{directory}/libosmium]"
-    subscribes :run, "git[#{directory}/osmium-tool]"
-  end
-
   execute "#{directory}/taginfo/Gemfile" do
     action :nothing
     command "bundle#{ruby_version} install"
@@ -196,7 +159,7 @@ node[:taginfo][:sites].each do |site|
     notifies :restart, "passenger_application[#{directory}/taginfo/web/public]"
   end
 
-  %w[taginfo/web/tmp bin data data/old download sources planet planet/log].each do |dir|
+  %w[taginfo/web/tmp bin data data/old download sources].each do |dir|
     directory "#{directory}/#{dir}" do
       owner "taginfo"
       group "taginfo"
@@ -204,30 +167,6 @@ node[:taginfo][:sites].each do |site|
     end
   end
 
-  remote_file "#{directory}/planet/planet.pbf" do
-    action :create_if_missing
-    source "https://planet.openstreetmap.org/pbf/planet-latest.osm.pbf"
-    owner "taginfo"
-    group "taginfo"
-    mode 0o644
-  end
-
-  template "#{directory}/bin/update-planet" do
-    source "update-planet.erb"
-    owner "taginfo"
-    group "taginfo"
-    mode 0o755
-    variables :directory => directory
-  end
-
-  template "#{directory}/bin/update-taginfo" do
-    source "update-taginfo.erb"
-    owner "taginfo"
-    group "taginfo"
-    mode 0o755
-    variables :directory => directory
-  end
-
   template "#{directory}/bin/update" do
     source "update.erb"
     owner "taginfo"
@@ -236,7 +175,9 @@ node[:taginfo][:sites].each do |site|
     variables :name => site_name, :directory => directory
   end
 
-  passenger_application "#{directory}/taginfo/web/public"
+  passenger_application "#{directory}/taginfo/web/public" do
+    action :nothing
+  end
 
   ssl_certificate site_name do
     domains [site_name] + site_aliases
@@ -249,3 +190,11 @@ node[:taginfo][:sites].each do |site|
     variables :aliases => site_aliases
   end
 end
+
+template "/usr/local/bin/taginfo-update" do
+  source "taginfo-update.erb"
+  owner "root"
+  group "root"
+  mode 0o755
+  variables :sites => node[:taginfo][:sites]
+end