squid: specify manager email

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

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 5cfdf541691f1654e34b45ef0757c9108c7dce62..11e90edfbbf1fe579a3cd5cf112b862b55715860 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -21,6 +21,8 @@ include_recipe "apache::ssl"
 
 package "perl"
 package "php5-cli"
+package "pbzip2"
+package "osmosis"
 
 remote_directory "/usr/local/bin" do
   source "bin"
@@ -39,6 +41,26 @@ template "/etc/cron.d/planet" do
   mode 0644
 end
 
+remote_directory "/store/planet" do
+  source "html"
+  owner "root"
+  group "root"
+  mode "0755"
+  files_owner "root"
+  files_group "root"
+  files_mode 0644
+end
+
+remote_directory "/store/planet" do
+  source "cgi"
+  owner "root"
+  group "root"
+  mode 0755
+  files_owner "root"
+  files_group "root"
+  files_mode 0755
+end
+
 apache_module "rewrite" do
   conf "rewrite.conf.erb"
 end
@@ -48,3 +70,10 @@ apache_module "proxy_http"
 apache_site "planet.openstreetmap.org" do
   template "apache.erb"
 end
+
+template "/etc/logrotate.d/apache2" do
+  source "logrotate.apache.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end