Fix rubocop and foodcritic complaints

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

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index c3324d0dc6ad60c884857b582bb8da2d5b6ed22f..07ea2d51c82293efd67d62a892ad55df5e1b7338 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -20,10 +20,15 @@
 include_recipe "apache::ssl"
 
 package "perl"
 include_recipe "apache::ssl"
 
 package "perl"

-package "php5-cli"

 package "pbzip2"
 package "osmosis"
 
 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"
 template "/etc/cron.d/planet" do
   source "cron.erb"
   owner "root"


@@ -51,6 +56,16 @@ remote_directory "/store/planet" do
   files_mode 0755
 end
 
   files_mode 0755
 end
 

+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
 [:xml_directory, :xml_history_directory,
  :pbf_directory, :pbf_history_directory].each do |dir|
   directory node[:planet][:dump][dir] do


@@ -66,6 +81,14 @@ directory "/store/planet/notes" do
   mode 0775
 end
 
   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"
 
 apache_module "rewrite"
 apache_module "proxy_http"
 


@@ -79,3 +102,5 @@ template "/etc/logrotate.d/apache2" do
   group "root"
   mode 0644
 end
   group "root"
   mode 0644
 end

+
+munin_plugin "planet_age"