From: Tom Hughes <tom@compton.nu>
Date: Thu, 25 Aug 2016 20:09:54 +0000 (+0100)
Subject: Drop renderd syslog config on 16.04
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/4a78565948891c672bfdd5fc720a2395a547543f

Drop renderd syslog config on 16.04

The renderd messages go to the journal on 16.04 not rsyslog.
---

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 8d8d2f03b..c9f4d1371 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -473,19 +473,30 @@ template "/etc/cron.d/render-lowzoom" do
   mode 0o644
 end
 
-template "/etc/rsyslog.d/20-renderd.conf" do
-  source "renderd.rsyslog.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-  notifies :restart, "service[rsyslog]"
-end
+if node[:lsb][:release].to_f >= 16.04
+  file "/etc/rsyslog.d/20-renderd.conf" do
+    action :delete
+    notifies :restart, "service[rsyslog]"
+  end
 
-template "/etc/logrotate.d/renderd" do
-  source "renderd.logrotate.erb"
-  owner "root"
-  group "root"
-  mode 0o644
+  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"