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 cc2396357cab2a67da2206a72e32dc1c9719e909..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
@@ -53,8 +55,8 @@ end
 
 remote_directory node[:planet][:dump][:xml_history_directory] do
   source "history_cgi"
-  owner "root"
-  group "root"
+  owner "www-data"
+  group "planet"
   mode 0755
   files_owner "root"
   files_group "root"
@@ -76,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"
 
@@ -89,3 +99,5 @@ template "/etc/logrotate.d/apache2" do
   group "root"
   mode 0644
 end
+
+munin_plugin "planet_age"