Use https URL for html base tag for nominatim.openstreetmap.org.

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

diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb
index 66efbb1465627b6cf1dfd3fcb2dfcec16c46ece2..e87575c735dd560e9b0ead4e05365f075def2123 100644 (file)
--- a/cookbooks/git/recipes/server.rb
+++ b/cookbooks/git/recipes/server.rb
@@ -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,17 +58,17 @@ 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
 

-  if node[:recipes].include?("trace") and repository != "dns.git"
-    template "#{git_directory}/#{repository}/hooks/post-receive" do
-      source "post-receive.erb"
-      owner "root"
-      group node[:git][:group]
-      mode 0755
-      variables :repository => "#{git_directory}/#{repository}"
-    end
+  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]
+    mode 0o755
+    variables :repository => "#{git_directory}/#{repository}"

   end
 end
 
   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