Fix planet-notes-dump cron escaping

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

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index c9e99852405afb2a346a790e624712e230d06efc..1edc46fdd95f18c61a7a19ed3692f89f394e134a 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -61,6 +61,24 @@ remote_directory "/store/planet" do
   files_mode 0755
 end
 
+directory "/store/planet/planet" do
+  owner "www-data"
+  group "planet"
+  mode 0775
+end
+
+directory "/store/planet/pbf" do
+  owner "www-data"
+  group "planet"
+  mode 0775
+end
+
+directory "/store/planet/notes" do
+  owner "www-data"
+  group "planet"
+  mode 0775
+end
+
 apache_module "rewrite" do
   conf "rewrite.conf.erb"
 end
@@ -70,3 +88,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