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 43cb17b294c40010e9eae86035fc96944424d903..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"
@@ -54,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
@@ -62,10 +64,6 @@ apache_module "cache"
 apache_module "cache_disk"
 apache_module "headers"
 
-file "/etc/cron.d/taginfo" do
-  action :delete
-end
-
 directory "/var/log/taginfo" do
   owner "taginfo"
   group "taginfo"
@@ -102,8 +100,9 @@ node[:taginfo][:sites].each do |site|
 
   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
@@ -160,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"
@@ -168,14 +167,6 @@ node[:taginfo][:sites].each do |site|
     end
   end
 
-  file "#{directory}/bin/update-planet" do
-    action :delete
-  end
-
-  file "#{directory}/bin/update-taginfo" do
-    action :delete
-  end
-
   template "#{directory}/bin/update" do
     source "update.erb"
     owner "taginfo"
@@ -184,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