Merge remote-tracking branch 'github/pull/89'

[chef.git] / cookbooks / stats / recipes / default.rb

diff --git a/cookbooks/stats/recipes/default.rb b/cookbooks/stats/recipes/default.rb
index 9a977603b7aeaf76cfb1614124169a97b7801eda..54d394f5243f45d2533d35edf5a01ade05e8b039 100644 (file)
--- a/cookbooks/stats/recipes/default.rb
+++ b/cookbooks/stats/recipes/default.rb
@@ -20,13 +20,14 @@
 include_recipe "apache"
 
 package "awstats"
 include_recipe "apache"
 
 package "awstats"

+package "libgeo-ipfree-perl"

 
 node[:stats][:sites].each do |site|
   template "/etc/awstats/awstats.#{site[:name]}.conf" do
     source "awstats.conf.erb"
     owner "root"
     group "root"
 
 node[:stats][:sites].each do |site|
   template "/etc/awstats/awstats.#{site[:name]}.conf" do
     source "awstats.conf.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables :site => site
   end
 end
     variables :site => site
   end
 end


@@ -35,37 +36,43 @@ template "/etc/cron.d/awstats" do
   source "awstats.cron.erb"
   owner "root"
   group "root"
   source "awstats.cron.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   variables :sites => node[:stats][:sites]
 end
 
 cookbook_file "/usr/local/bin/repack-archived-logs" do
   owner "root"
   group "root"
   variables :sites => node[:stats][:sites]
 end
 
 cookbook_file "/usr/local/bin/repack-archived-logs" do
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 template "/etc/cron.d/repack-archived-logs" do
   source "repack.cron.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/cron.d/repack-archived-logs" do
   source "repack.cron.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 
 directory "/srv/stats.openstreetmap.org" do
   owner "root"
   group "root"
 end
 
 directory "/srv/stats.openstreetmap.org" do
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 template "/srv/stats.openstreetmap.org/index.html" do
   source "index.html.erb"
   owner "root"
   group "root"
 end
 
 template "/srv/stats.openstreetmap.org/index.html" do
   source "index.html.erb"
   owner "root"
   group "root"

-  mode 644
+  mode 0o644

   variables :sites => node[:stats][:sites]
 end
 
   variables :sites => node[:stats][:sites]
 end
 

+cookbook_file "/srv/stats.openstreetmap.org/robots.txt" do
+  owner "root"
+  group "root"
+  mode 0o644
+end
+

 apache_site "stats.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/stats.openstreetmap.org"
 apache_site "stats.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/stats.openstreetmap.org"