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

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index ba18e2a6a..99798fd05 100644
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -20,15 +20,17 @@
 include_recipe "apache::ssl"
 
 package "perl"
-package "php5-cli"
 package "pbzip2"
 package "osmosis"
 
-template "/etc/cron.d/planet" do
-  source "cron.erb"
-  owner "root"
-  group "root"
-  mode 0644
+if node[:lsb][:release].to_f >= 16.04
+  package "php-cli"
+else
+  package "php5-cli"
+end
+
+file "/etc/cron.d/planet" do
+  action :delete
 end
 
 remote_directory "/store/planet" do
@@ -51,9 +53,19 @@ remote_directory "/store/planet" do
   files_mode 0755
 end
 
-["xml_directory", "xml_history_directory",
- "pbf_directory", "pbf_history_directory"].each do |dir|
-  directory dir do
+remote_directory node[:planet][:dump][:xml_history_directory] do
+  source "history_cgi"
+  owner "www-data"
+  group "planet"
+  mode 0755
+  files_owner "root"
+  files_group "root"
+  files_mode 0755
+end
+
+[: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
@@ -66,6 +78,14 @@ directory "/store/planet/notes" do
   mode 0775
 end
 
+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"
 
@@ -79,3 +99,5 @@ template "/etc/logrotate.d/apache2" do
   group "root"
   mode 0644
 end
+
+munin_plugin "planet_age"