Update OTRS to 4.0.29

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

diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb
index 52d6304b090d8e8b4f80f99828d2a6ac1b5227ff..1d308bf29adb18bb28ef76ab7d57e250d9a4a4ff 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,


@@ -25,11 +25,11 @@ git_directory = node[:git][:directory]
 directory git_directory do
   owner node[:git][:user]
   group node[:git][:group]
 directory git_directory do
   owner node[:git][:user]
   group node[:git][:group]

-  mode 02775
+  mode 0o2775

 end
 
 if node[:git][:allowed_nodes]
 end
 
 if node[:git][:allowed_nodes]

-  search(:node, node[:git][:allowed_nodes]).each do |n|
+  search(:node, node[:git][:allowed_nodes]).sort_by { |n| n[:fqdn] }.each do |n|

     n.interfaces(:role => :external).each do |interface|
       firewall_rule "accept-git" do
         action :accept
     n.interfaces(:role => :external).each do |interface|
       firewall_rule "accept-git" do
         action :accept


@@ -58,16 +58,16 @@ Dir.new(git_directory).select { |name| name =~ /\.git$/ }.each do |repository|
     source "post-update.erb"
     owner "root"
     group node[:git][:group]
     source "post-update.erb"
     owner "root"
     group node[:git][:group]

-    mode 0755
+    mode 0o755

   end
 
   end
 

-  next unless node[:recipes].include?("trac") && repository != "dns.git"
+  next unless node[:recipes].include?("trac") && repository != "dns.git" && repository != "chef.git"

 
   template "#{git_directory}/#{repository}/hooks/post-receive" do
     source "post-receive.erb"
     owner "root"
     group node[:git][:group]
 
   template "#{git_directory}/#{repository}/hooks/post-receive" do
     source "post-receive.erb"
     owner "root"
     group node[:git][:group]

-    mode 0755
+    mode 0o755

     variables :repository => "#{git_directory}/#{repository}"
   end
 end
     variables :repository => "#{git_directory}/#{repository}"
   end
 end


@@ -76,13 +76,13 @@ 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
 
 template "/etc/xinetd.d/git" do
   source "xinetd.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/xinetd.d/git" do
   source "xinetd.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   notifies :reload, "service[xinetd]"
 end
   notifies :reload, "service[xinetd]"
 end