nominatim: fix string format for state

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index fe3b6c8622543aa1935dfd7fac75794fd2a16f9e..3e9f6a813d2f3697d2536bd55a2587ecbfe044cc 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -422,7 +422,7 @@ end
 file node[:tile][:node_file] do
   owner "tile"
   group "www-data"
-  mode 0o640
+  mode 0o660
 end
 
 directory "/var/log/tile" do
@@ -436,34 +436,55 @@ package %w[
   osmosis
 ]
 
-package %w[
-  ruby
-  ruby-dev
-]
-
-package %w[
-  libproj-dev
-  libxml2-dev
-]
+if node[:lsb][:release].to_f >= 18.04
+  package %w[
+    pyosmium
+    python-pyproj
+  ]
 
-gem_package "proj4rb"
-gem_package "libxml-ruby"
+  remote_directory "/usr/local/bin" do
+    source "bin"
+    owner "root"
+    group "root"
+    mode 0o755
+    files_owner "root"
+    files_group "root"
+    files_mode 0o755
+  end
 
-remote_directory "/usr/local/lib/site_ruby" do
-  source "ruby"
-  owner "root"
-  group "root"
-  mode 0o755
-  files_owner "root"
-  files_group "root"
-  files_mode 0o644
-end
+  template "/usr/local/bin/expire-tiles" do
+    source "expire-tiles.bionic.erb"
+    owner "root"
+    group "root"
+    mode 0o755
+  end
+else
+  package %w[
+    ruby
+    ruby-dev
+    libproj-dev
+    libxml2-dev
+  ]
+
+  gem_package "proj4rb"
+  gem_package "libxml-ruby"
+
+  remote_directory "/usr/local/lib/site_ruby" do
+    source "ruby"
+    owner "root"
+    group "root"
+    mode 0o755
+    files_owner "root"
+    files_group "root"
+    files_mode 0o644
+  end
 
-template "/usr/local/bin/expire-tiles" do
-  source "expire-tiles.erb"
-  owner "root"
-  group "root"
-  mode 0o755
+  template "/usr/local/bin/expire-tiles" do
+    source "expire-tiles.xenial.erb"
+    owner "root"
+    group "root"
+    mode 0o755
+  end
 end
 
 directory "/var/lib/replicate" do