Revert "Switch web site to use MapQuest Nominatim for search"

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

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 5cfdf541691f1654e34b45ef0757c9108c7dce62..706e766e8c57f8581d3958267795c81b7455be25 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 "perl"
 package "php5-cli"

+package "pbzip2"
+package "osmosis"

 
 remote_directory "/usr/local/bin" do
   source "bin"
 
 remote_directory "/usr/local/bin" do
   source "bin"


@@ -39,12 +41,54 @@ template "/etc/cron.d/planet" do
   mode 0644
 end
 
   mode 0644
 end
 

-apache_module "rewrite" do
-  conf "rewrite.conf.erb"
+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
 
 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"

 apache_module "proxy_http"
 
 apache_site "planet.openstreetmap.org" do
   template "apache.erb"
 end
 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