Merge branch 'planetdump-ng'

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

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index c9e99852405afb2a346a790e624712e230d06efc..51470380dc47684f04331f2e05355262afc7a1b0 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -61,12 +61,31 @@ remote_directory "/store/planet" do
   files_mode 0755
 end
 
-apache_module "rewrite" do
-  conf "rewrite.conf.erb"
+[:xml_directory, :xml_history_directory,
+ :pbf_directory, :pbf_history_directory].each do |dir|
+  directory dir do
+    owner "www-data"
+    group "planet"
+    mode 0775
+  end
 end
 
+directory "/store/planet/notes" do
+  owner "www-data"
+  group "planet"
+  mode 0775
+end
+
+apache_module "rewrite"
 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