X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e49914e642597609b3589ae7de6554fd6dbb7916..35f220a555dee107786152d3daff4d66d1655e56:/cookbooks/planet/recipes/default.rb

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 0f050ee7d..07ea2d51c 100644
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -20,10 +20,15 @@
 include_recipe "apache::ssl"
 
 package "perl"
-package "php5-cli"
 package "pbzip2"
 package "osmosis"
 
+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"
@@ -56,8 +61,8 @@ remote_directory node[:planet][:dump][:xml_history_directory] do
   owner "www-data"
   group "planet"
   mode 0755
-  files_owner "www-data"
-  files_group "planet"
+  files_owner "root"
+  files_group "root"
   files_mode 0755
 end
 
@@ -76,6 +81,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"
 
@@ -89,3 +102,5 @@ template "/etc/logrotate.d/apache2" do
   group "root"
   mode 0644
 end
+
+munin_plugin "planet_age"