Use file resource to remove old planet cron file

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

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 0c5c235b7cd4dfcb7362e551ec008b7702cdb34d..99798fd056f934c24dafd1368cb77746622fcfde 100644 (file)
--- 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
@@ -83,8 +85,8 @@ template "/usr/local/bin/apache-latest-planet-filename" do
   mode 0755
 end
 
+apache_module "cgid"
 apache_module "rewrite"
-apache_module "proxy"
 apache_module "proxy_http"
 
 apache_site "planet.openstreetmap.org" do