From: Tom Hughes <tom@compton.nu>
Date: Fri, 7 Sep 2018 23:07:32 +0000 (+0100)
Subject: Remove support for Ubuntu 16.04 render servers
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/66db0f15b4041d1156f7837934db40159ac5c357

Remove support for Ubuntu 16.04 render servers
---

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 4d08e6c10..645bb0998 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -434,58 +434,26 @@ end
 package %w[
   osm2pgsql
   osmosis
+  ruby
+  pyosmium
+  python-pyproj
 ]
 
-if node[:lsb][:release].to_f >= 18.04
-  package %w[
-    ruby
-    pyosmium
-    python-pyproj
-  ]
-
-  remote_directory "/usr/local/bin" do
-    source "bin"
-    owner "root"
-    group "root"
-    mode 0o755
-    files_owner "root"
-    files_group "root"
-    files_mode 0o755
-  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
+remote_directory "/usr/local/bin" do
+  source "bin"
+  owner "root"
+  group "root"
+  mode 0o755
+  files_owner "root"
+  files_group "root"
+  files_mode 0o755
+end
 
-  template "/usr/local/bin/expire-tiles" do
-    source "expire-tiles.xenial.erb"
-    owner "root"
-    group "root"
-    mode 0o755
-  end
+template "/usr/local/bin/expire-tiles" do
+  source "expire-tiles.erb"
+  owner "root"
+  group "root"
+  mode 0o755
 end
 
 directory "/var/lib/replicate" do
diff --git a/cookbooks/tile/templates/default/expire-tiles.bionic.erb b/cookbooks/tile/templates/default/expire-tiles.erb
similarity index 100%
rename from cookbooks/tile/templates/default/expire-tiles.bionic.erb
rename to cookbooks/tile/templates/default/expire-tiles.erb
diff --git a/cookbooks/tile/templates/default/expire-tiles.xenial.erb b/cookbooks/tile/templates/default/expire-tiles.xenial.erb
deleted file mode 100644
index 1a8a01a26..000000000
--- a/cookbooks/tile/templates/default/expire-tiles.xenial.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/ruby
-
-# DO NOT EDIT - This file is being maintained by Chef
-
-require 'expire'
-
-tile_dirs = [
-<% node[:tile][:styles].each do |name,details| -%>
-  "/srv/tile.openstreetmap.org/tiles/<%= name %>",
-<% end -%>
-]
-
-max_zoom = <%= node[:tile][:styles].collect { |n,d| d[:max_zoom] }.max %>
-
-Dir.glob("/var/lib/replicate/expire-queue/changes-*.gz").each do |f|
-   Expire::expire(f, 13, max_zoom, tile_dirs)
-   File::unlink(f)
-end