Merge remote-tracking branch 'github/pull/79'

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

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 11e90edfbbf1fe579a3cd5cf112b862b55715860..28bf482735766231596f8d1dfa345e9483fa9b32 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -20,25 +20,17 @@
 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
-  source "cron.erb"
-  owner "root"
-  group "root"
-  mode 0644
+file "/etc/cron.d/planet" do
+  action :delete
 end
 
 remote_directory "/store/planet" do
@@ -48,23 +40,53 @@ remote_directory "/store/planet" do
   mode "0755"
   files_owner "root"
   files_group "root"
-  files_mode 0644
+  files_mode 0o644
 end
 
 remote_directory "/store/planet" do
   source "cgi"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   files_owner "root"
   files_group "root"
-  files_mode 0755
+  files_mode 0o755
 end
 
-apache_module "rewrite" do
-  conf "rewrite.conf.erb"
+remote_directory node[:planet][:dump][:xml_history_directory] do
+  source "history_cgi"
+  owner "www-data"
+  group "planet"
+  mode 0o755
+  files_owner "root"
+  files_group "root"
+  files_mode 0o755
 end
 
+[: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 0o775
+  end
+end
+
+directory "/store/planet/notes" do
+  owner "www-data"
+  group "planet"
+  mode 0o775
+end
+
+template "/usr/local/bin/apache-latest-planet-filename" do
+  source "apache-latest-planet-filename.erb"
+  owner "root"
+  group "root"
+  mode 0o755
+end
+
+apache_module "cgid"
+apache_module "rewrite"
 apache_module "proxy_http"
 
 apache_site "planet.openstreetmap.org" do
@@ -75,5 +97,7 @@ template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
+
+munin_plugin "planet_age"