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 1edc46fdd95f18c61a7a19ed3692f89f394e134a..07ea2d51c82293efd67d62a892ad55df5e1b7338 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -20,18 +20,13 @@
 include_recipe "apache::ssl"
 
 package "perl"
-package "php5-cli"
 package "pbzip2"
 package "osmosis"
 
-remote_directory "/usr/local/bin" do
-  source "bin"
-  owner "root"
-  group "root"
-  mode 0755
-  files_owner "root"
-  files_group "root"
-  files_mode 0755
+if node[:lsb][:release].to_f >= 16.04
+  package "php-cli"
+else
+  package "php5-cli"
 end
 
 template "/etc/cron.d/planet" do
@@ -61,16 +56,23 @@ remote_directory "/store/planet" do
   files_mode 0755
 end
 
-directory "/store/planet/planet" do
+remote_directory node[:planet][:dump][:xml_history_directory] do
+  source "history_cgi"
   owner "www-data"
   group "planet"
-  mode 0775
+  mode 0755
+  files_owner "root"
+  files_group "root"
+  files_mode 0755
 end
 
-directory "/store/planet/pbf" do
-  owner "www-data"
-  group "planet"
-  mode 0775
+[: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
+  end
 end
 
 directory "/store/planet/notes" do
@@ -79,10 +81,15 @@ directory "/store/planet/notes" do
   mode 0775
 end
 
-apache_module "rewrite" do
-  conf "rewrite.conf.erb"
+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_site "planet.openstreetmap.org" do
@@ -95,3 +102,5 @@ template "/etc/logrotate.d/apache2" do
   group "root"
   mode 0644
 end
+
+munin_plugin "planet_age"