From: Tom Hughes <tom@compton.nu>
Date: Mon, 12 Sep 2016 21:36:10 +0000 (+0100)
Subject: Drop Ubuntu 14.04 support from tile cookbook
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/3c3c35ef006e1f86814d5fef5e17dcc9c2aea52c?hp=77b589abca2c670e5314a318b2b52aa0668a0dc3

Drop Ubuntu 14.04 support from tile cookbook
---

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index c17800156..4bfbcb455 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -118,13 +118,7 @@ package "python-mapnik"
 
 package "ttf-dejavu"
 package "ttf-unifont"
-
-if node[:lsb][:release].to_f >= 16.04
-  package "fonts-droid-fallback"
-else
-  package "fonts-droid"
-end
-
+package "fonts-droid-fallback"
 package "fonts-sipa-arundina"
 package "fonts-sil-padauk"
 package "fonts-khmeros"
@@ -497,32 +491,6 @@ template "/etc/cron.d/render-lowzoom" do
   mode 0o644
 end
 
-if node[:lsb][:release].to_f >= 16.04
-  file "/etc/rsyslog.d/20-renderd.conf" do
-    action :delete
-    notifies :restart, "service[rsyslog]"
-  end
-
-  file "/etc/logrotate.d/renderd" do
-    action :delete
-  end
-else
-  template "/etc/rsyslog.d/20-renderd.conf" do
-    source "renderd.rsyslog.erb"
-    owner "root"
-    group "root"
-    mode 0o644
-    notifies :restart, "service[rsyslog]"
-  end
-
-  template "/etc/logrotate.d/renderd" do
-    source "renderd.logrotate.erb"
-    owner "root"
-    group "root"
-    mode 0o644
-  end
-end
-
 package "liblockfile-simple-perl"
 package "libfilesys-df-perl"
 
diff --git a/cookbooks/tile/templates/default/renderd.conf.erb b/cookbooks/tile/templates/default/renderd.conf.erb
index 33adc8a9c..69479e0b0 100644
--- a/cookbooks/tile/templates/default/renderd.conf.erb
+++ b/cookbooks/tile/templates/default/renderd.conf.erb
@@ -7,11 +7,7 @@ tile_dir=/srv/tile.openstreetmap.org/tiles
 stats_file=/var/run/renderd/renderd.stats
 
 [mapnik]
-<% if node[:lsb][:release].to_f >= 16.04 -%>
 plugins_dir=/usr/lib/mapnik/3.0/input
-<% else -%>
-plugins_dir=/usr/lib/mapnik/2.2/input
-<% end -%>
 font_dir=/usr/share/fonts
 font_dir_recurse=true
 <% node[:tile][:styles].each do |name,details| -%>
diff --git a/cookbooks/tile/templates/default/renderd.logrotate.erb b/cookbooks/tile/templates/default/renderd.logrotate.erb
deleted file mode 100644
index 781045cba..000000000
--- a/cookbooks/tile/templates/default/renderd.logrotate.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-# DO NOT EDIT - This file is being maintained by Chef
-
-/var/log/tile/renderd.log {
-  daily
-  rotate 28
-  compress
-  delaycompress
-  notifempty
-  postrotate
-    reload rsyslog >/dev/null 2>&1 || true
-  endscript
-}
diff --git a/cookbooks/tile/templates/default/renderd.rsyslog.erb b/cookbooks/tile/templates/default/renderd.rsyslog.erb
deleted file mode 100644
index 59c62e6b6..000000000
--- a/cookbooks/tile/templates/default/renderd.rsyslog.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT - This file is being maintained by Chef
-
-if $programname == 'renderd' then -/var/log/tile/renderd.log
-& ~