tilecache: remove redundant squid config

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

diff --git a/cookbooks/chef/recipes/repository.rb b/cookbooks/chef/recipes/repository.rb
index 09713b4be1e0d874c38b1861fa05b5189dd26b97..28d0b2f39367ca85bab94406a9407a6dbfb93c20 100644 (file)
--- a/cookbooks/chef/recipes/repository.rb
+++ b/cookbooks/chef/recipes/repository.rb
@@ -1,14 +1,14 @@
 #
 #

-# 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.
 # 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,


@@ -24,47 +24,45 @@ keys = data_bag_item("chef", "keys")
 directory "/var/lib/chef" do
   owner "chefrepo"
   group "chefrepo"
 directory "/var/lib/chef" do
   owner "chefrepo"
   group "chefrepo"

-  mode 02775
+  mode 0o2775

 end
 
 end
 

-git "/var/lib/chef" do
-  action :checkout
-  repository node[:chef][:repository]
-  revision "master"
-  user "chefrepo"
-  group "chefrepo"
-end
+%w[public private].each do |repository|
+  repository_directory = node[:chef][:"#{repository}_repository"]

 
 

-directory "/var/lib/chef/.chef" do
-  owner "chefrepo"
-  group "chefrepo"
-  mode 02775
-end
+  git "/var/lib/chef/#{repository}" do
+    action :checkout
+    repository repository_directory
+    revision "master"
+    user "chefrepo"
+    group "chefrepo"
+  end

 
 

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

 
 

-cookbook_file "/var/lib/chef/.chef/knife.rb" do
-  source "knife.rb"
-  owner "chefrepo"
-  group "chefrepo"
-  mode 0660
-end
+  file "/var/lib/chef/#{repository}/.chef/client.pem" do
+    content keys["git"].join("\n")
+    owner "chefrepo"
+    group "chefrepo"
+    mode 0o660
+  end

 
 

-template "#{node[:chef][:repository]}/hooks/post-receive" do
-  source "post-receive.erb"
-  owner "chefrepo"
-  group "chefrepo"
-  mode 0750
-end
+  cookbook_file "/var/lib/chef/#{repository}/.chef/knife.rb" do
+    source "knife.rb"
+    owner "chefrepo"
+    group "chefrepo"
+    mode 0o660
+  end

 
 

-template "/etc/cron.daily/chef-repository-backup" do
-  source "repository-backup.cron.erb"
-  owner "root"
-  group "root"
-  mode 0755
+  template "#{repository_directory}/hooks/post-receive" do
+    source "post-receive.erb"
+    owner "chefrepo"
+    group "chefrepo"
+    mode 0o750
+    variables :repository => repository
+  end

 end
 end