X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/e995ca991a42a599d07fa87ae19a3ab650652de1..f790f8c1fb14644fa8cbe397ea7b9727ead6ed67:/cookbooks/planet/recipes/default.rb

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 1edc46fdd..99798fd05 100644
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -20,25 +20,17 @@
 include_recipe "apache::ssl"
 
 package "perl"
-package "php5-cli"
 package "pbzip2"
 package "osmosis"
 
-remote_directory "/usr/local/bin" do
-  source "bin"
-  owner "root"
-  group "root"
-  mode 0755
-  files_owner "root"
-  files_group "root"
-  files_mode 0755
+if node[:lsb][:release].to_f >= 16.04
+  package "php-cli"
+else
+  package "php5-cli"
 end
 
-template "/etc/cron.d/planet" do
-  source "cron.erb"
-  owner "root"
-  group "root"
-  mode 0644
+file "/etc/cron.d/planet" do
+  action :delete
 end
 
 remote_directory "/store/planet" do
@@ -61,16 +53,23 @@ remote_directory "/store/planet" do
   files_mode 0755
 end
 
-directory "/store/planet/planet" do
+remote_directory node[:planet][:dump][:xml_history_directory] do
+  source "history_cgi"
   owner "www-data"
   group "planet"
-  mode 0775
+  mode 0755
+  files_owner "root"
+  files_group "root"
+  files_mode 0755
 end
 
-directory "/store/planet/pbf" do
-  owner "www-data"
-  group "planet"
-  mode 0775
+[:xml_directory, :xml_history_directory,
+ :pbf_directory, :pbf_history_directory].each do |dir|
+  directory node[:planet][:dump][dir] do
+    owner "www-data"
+    group "planet"
+    mode 0775
+  end
 end
 
 directory "/store/planet/notes" do
@@ -79,10 +78,15 @@ directory "/store/planet/notes" do
   mode 0775
 end
 
-apache_module "rewrite" do
-  conf "rewrite.conf.erb"
+template "/usr/local/bin/apache-latest-planet-filename" do
+  source "apache-latest-planet-filename.erb"
+  owner "root"
+  group "root"
+  mode 0755
 end
 
+apache_module "cgid"
+apache_module "rewrite"
 apache_module "proxy_http"
 
 apache_site "planet.openstreetmap.org" do
@@ -95,3 +99,5 @@ template "/etc/logrotate.d/apache2" do
   group "root"
   mode 0644
 end
+
+munin_plugin "planet_age"