nominatim: fix directory creation order

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

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index ba18e2a6a3394c7cdafd08c1775eaa4c6f8a4af6..28bf482735766231596f8d1dfa345e9483fa9b32 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -20,15 +20,17 @@
 include_recipe "apache::ssl"
 
 package "perl"
 include_recipe "apache::ssl"
 
 package "perl"

-package "php5-cli"

 package "pbzip2"
 package "osmosis"
 
 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
 end
 
 remote_directory "/store/planet" do


@@ -38,34 +40,52 @@ remote_directory "/store/planet" do
   mode "0755"
   files_owner "root"
   files_group "root"
   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"
 end
 
 remote_directory "/store/planet" do
   source "cgi"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

   files_owner "root"
   files_group "root"
   files_owner "root"
   files_group "root"

-  files_mode 0755
+  files_mode 0o755

 end
 
 end
 

-["xml_directory", "xml_history_directory",
- "pbf_directory", "pbf_history_directory"].each do |dir|
-  directory dir do
+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"
     owner "www-data"
     group "planet"

-    mode 0775
+    mode 0o775

   end
 end
 
 directory "/store/planet/notes" do
   owner "www-data"
   group "planet"
   end
 end
 
 directory "/store/planet/notes" do
   owner "www-data"
   group "planet"

-  mode 0775
+  mode 0o775

 end
 
 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_module "rewrite"
 apache_module "proxy_http"
 


@@ -77,5 +97,7 @@ template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
   source "logrotate.apache.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 end

+
+munin_plugin "planet_age"