Match number of apache workers on tile servers to the CPU count

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

diff --git a/cookbooks/git/recipes/web.rb b/cookbooks/git/recipes/web.rb
index 65333eff00426873980728b842f766a2d86bf1d1..bb99e482cd4257d2a999bc6ee90695dec295ec01 100644 (file)
--- a/cookbooks/git/recipes/web.rb
+++ b/cookbooks/git/recipes/web.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: git
+# Cookbook:: git

 # Recipe:: web
 #
 # Recipe:: web
 #

-# 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,6 +21,7 @@ include_recipe "apache"
 
 package "gitweb"
 
 
 package "gitweb"
 

+apache_module "cgid"

 apache_module "rewrite"
 
 git_site = node[:git][:host]
 apache_module "rewrite"
 
 git_site = node[:git][:host]


@@ -29,20 +30,27 @@ template "/etc/gitweb.conf" do
   source "gitweb.conf.erb"
   owner "root"
   group "root"
   source "gitweb.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 directory "/srv/#{git_site}" do
   owner "root"
   group "root"
 end
 
 directory "/srv/#{git_site}" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

 end
 
 template "/srv/#{git_site}/robots.txt" do
   source "robots.txt.erb"
   owner "root"
   group "root"
 end
 
 template "/srv/#{git_site}/robots.txt" do
   source "robots.txt.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"
+end
+
+template "/srv/#{git_site}/indextext.html" do
+  source "indextext.html.erb"
+  owner "root"
+  group "root"
+  mode "644"

 end
 
 ssl_certificate git_site do
 end
 
 ssl_certificate git_site do