Respond with 429 to abusive "ping" requests

[chef.git] / cookbooks / chef / recipes / repository.rb

diff --git a/cookbooks/chef/recipes/repository.rb b/cookbooks/chef/recipes/repository.rb
index a358e78e2654b719fa0e6775b9833557fbfbb0a7..d5d8d2bc2817c6eeb759ca27f012672ea36fa193 100644 (file)
--- a/cookbooks/chef/recipes/repository.rb
+++ b/cookbooks/chef/recipes/repository.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: chef
+# Cookbook:: chef

 # Recipe:: repository
 #
 # Recipe:: repository
 #

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

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -21,10 +21,14 @@ include_recipe "git"
 
 keys = data_bag_item("chef", "keys")
 
 
 keys = data_bag_item("chef", "keys")
 

+chef_gem "bundler" do
+  version ">= 2.1.4"
+end
+

 directory "/var/lib/chef" do
   owner "chefrepo"
   group "chefrepo"
 directory "/var/lib/chef" do
   owner "chefrepo"
   group "chefrepo"

-  mode 0o2775
+  mode "2775"

 end
 
 %w[public private].each do |repository|
 end
 
 %w[public private].each do |repository|


@@ -41,28 +45,28 @@ end
   directory "/var/lib/chef/#{repository}/.chef" do
     owner "chefrepo"
     group "chefrepo"
   directory "/var/lib/chef/#{repository}/.chef" do
     owner "chefrepo"
     group "chefrepo"

-    mode 0o2775
+    mode "2775"

   end
 
   file "/var/lib/chef/#{repository}/.chef/client.pem" do
     content keys["git"].join("\n")
     owner "chefrepo"
     group "chefrepo"
   end
 
   file "/var/lib/chef/#{repository}/.chef/client.pem" do
     content keys["git"].join("\n")
     owner "chefrepo"
     group "chefrepo"

-    mode 0o660
+    mode "660"

   end
 
   cookbook_file "/var/lib/chef/#{repository}/.chef/knife.rb" do
     source "knife.rb"
     owner "chefrepo"
     group "chefrepo"
   end
 
   cookbook_file "/var/lib/chef/#{repository}/.chef/knife.rb" do
     source "knife.rb"
     owner "chefrepo"
     group "chefrepo"

-    mode 0o660
+    mode "660"

   end
 
   template "#{repository_directory}/hooks/post-receive" do
     source "post-receive.erb"
     owner "chefrepo"
     group "chefrepo"
   end
 
   template "#{repository_directory}/hooks/post-receive" do
     source "post-receive.erb"
     owner "chefrepo"
     group "chefrepo"

-    mode 0o750
+    mode "750"

     variables :repository => repository
   end
 end
     variables :repository => repository
   end
 end