X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a2fb79fc31c9038440bc7dfc28a328bf88bad901..50b8039333fdef4928b3ec9534a6d6fda70a2803:/cookbooks/tile/recipes/default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 8d8d2f03b..f8a808d73 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -62,9 +62,23 @@ end
 
 package "renderd"
 
+systemd_service "renderd" do
+  description "Mapnik rendering daemon"
+  after "postgresql.service"
+  wants "postgresql.service"
+  user "www-data"
+  exec_start "/usr/bin/renderd -f"
+  standard_error "null"
+  private_tmp true
+  private_devices true
+  private_network true
+  protect_system "full"
+  protect_home true
+  restart "on-failure"
+end
+
 service "renderd" do
   action [:enable, :start]
-  supports :status => false, :restart => true, :reload => false
 end
 
 directory "/srv/tile.openstreetmap.org/tiles" do
@@ -158,12 +172,17 @@ package "mapnik-utils"
 node[:tile][:data].each_value do |data|
   url = data[:url]
   file = "/srv/tile.openstreetmap.org/data/#{File.basename(url)}"
-  directory = "/srv/tile.openstreetmap.org/data/#{data[:directory]}"
 
-  directory directory do
-    owner "tile"
-    group "tile"
-    mode 0o755
+  if data[:directory]
+    directory = "/srv/tile.openstreetmap.org/data/#{data[:directory]}"
+
+    directory directory do
+      owner "tile"
+      group "tile"
+      mode 0o755
+    end
+  else
+    directory = "/srv/tile.openstreetmap.org/data"
   end
 
   if file =~ /\.tgz$/
@@ -473,19 +492,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"