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 7befcdc20980b77fde84a9e8a3a18cd4d3829a11..3e9f6a813d2f3697d2536bd55a2587ecbfe044cc 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -38,6 +38,11 @@ apache_module "tile" do
   conf "tile.conf.erb"
 end
 
+ssl_certificate node[:fqdn] do
+  domains [node[:fqdn], "tile.openstreetmap.org", "render.openstreetmap.org"]
+  notifies :reload, "service[apache2]"
+end
+
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 
 apache_site "default" do
@@ -353,9 +358,10 @@ node[:tile][:styles].each do |name, details|
 end
 
 postgresql_version = node[:tile][:database][:cluster].split("/").first
+postgis_version = node[:tile][:database][:postgis]
 
 package "postgis"
-package "postgresql-#{postgresql_version}-postgis-2.3"
+package "postgresql-#{postgresql_version}-postgis-#{postgis_version}"
 
 postgresql_user "jburgess" do
   cluster node[:tile][:database][:cluster]
@@ -416,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
@@ -430,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