tilecache: reject request without user-agent (try2)

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

diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb
index 4f537e62d0b7958f23608fd7eecddcb90ac40e0e..81b16952fc446f1cd1bbd241812ee9a5556562d8 100644 (file)
--- a/cookbooks/git/recipes/server.rb
+++ b/cookbooks/git/recipes/server.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,


@@ -22,52 +22,29 @@ include_recipe "networking"
 git_directory = node[:git][:directory]
 
 directory git_directory do
 git_directory = node[:git][:directory]
 
 directory git_directory do

-  owner "git"
-  group "git"
-  mode 02775
+  owner "root"
+  group "root"
+  mode 0o775

 end
 
 end
 

-if node[:git][:allowed_nodes]
-  search(:node, node[:git][:allowed_nodes]).each do |n|
-    n.interfaces(:role => :external).each do |interface|
-      firewall_rule "accept-git" do
-        action :accept
-        family interface[:family]
-        source "#{interface[:zone]}:#{interface[:address]}"
-        dest "fw"
-        proto "tcp:syn"
-        dest_ports "git"
-        source_ports "1024:"
-      end
-    end
-  end
-else
-  firewall_rule "accept-git" do
-    action :accept
-    source "net"
-    dest "fw"
-    proto "tcp:syn"
-    dest_ports "git"
-    source_ports "1024:"
-  end
+directory "#{git_directory}/public" do
+  owner node[:git][:public_user]
+  group node[:git][:public_group]
+  mode 0o2775

 end
 
 end
 

-Dir.new(git_directory).select { |name| name =~ /\.git$/ }.each do |repository|
-  template "#{git_directory}/#{repository}/hooks/post-update" do
+directory "#{git_directory}/private" do
+  owner node[:git][:private_user]
+  group node[:git][:private_group]
+  mode 0o2775
+end
+
+Dir.glob("#{git_directory}/*/*.git").each do |repository|
+  template "#{repository}/hooks/post-update" do

     source "post-update.erb"
     owner "root"
     source "post-update.erb"
     owner "root"

-    group "git"
-    mode 0755
-  end
-
-  if repository != "dns.git"
-    template "#{git_directory}/#{repository}/hooks/post-receive" do
-      source "post-receive.erb"
-      owner "root"
-      group "git"
-      mode 0755
-      variables :repository => "#{git_directory}/#{repository}"
-    end
+    group node[:git][:group]
+    mode 0o755

   end
 end
 
   end
 end
 


@@ -75,5 +52,5 @@ template "/etc/cron.daily/git-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
   source "backup.cron.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 end