Update piwik to 2.17.1

[chef.git] / cookbooks / tile / recipes / default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 8d8d2f03beb7b751bee48dd602e42ff7c17b2273..dd4a7a603590385e42e0c35edbeff68321d29482 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -62,9 +62,24 @@ end
 
 package "renderd"
 
 
 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"
+  runtime_directory "renderd"
+  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]
 service "renderd" do
   action [:enable, :start]

-  supports :status => false, :restart => true, :reload => false

 end
 
 directory "/srv/tile.openstreetmap.org/tiles" do
 end
 
 directory "/srv/tile.openstreetmap.org/tiles" do


@@ -102,23 +117,11 @@ end
 package "python-cairo"
 package "python-mapnik"
 
 package "python-cairo"
 package "python-mapnik"
 

-package "ttf-dejavu"
+package "fonts-noto-cjk"
+package "fonts-noto-hinted"
+package "fonts-noto-unhinted"

 package "ttf-unifont"
 
 package "ttf-unifont"
 

-if node[:lsb][:release].to_f >= 16.04
-  package "fonts-droid-fallback"
-else
-  package "fonts-droid"
-end
-
-package "fonts-sipa-arundina"
-package "fonts-sil-padauk"
-package "fonts-khmeros"
-package "fonts-beng-extra"
-package "fonts-gargi"
-package "fonts-taml-tscu"
-package "fonts-tibetan-machine"
-

 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"


@@ -158,12 +161,17 @@ package "mapnik-utils"
 node[:tile][:data].each_value do |data|
   url = data[:url]
   file = "/srv/tile.openstreetmap.org/data/#{File.basename(url)}"
 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$/
   end
 
   if file =~ /\.tgz$/


@@ -438,18 +446,23 @@ template "/usr/local/bin/replicate" do
   mode 0o755
 end
 
   mode 0o755
 end
 

-template "/etc/init.d/replicate" do
-  source "replicate.init.erb"
-  owner "root"
-  group "root"
-  mode 0o755
+systemd_service "replicate" do
+  description "Rendering database replication service"
+  after "postgresql.service"
+  wants "postgresql.service"
+  user "tile"
+  exec_start "/usr/local/bin/replicate"
+  private_tmp true
+  private_devices true
+  protect_system "full"
+  protect_home true
+  restart "on-failure"

 end
 
 service "replicate" do
   action [:enable, :start]
 end
 
 service "replicate" do
   action [:enable, :start]

-  supports :restart => true

   subscribes :restart, "template[/usr/local/bin/replicate]"
   subscribes :restart, "template[/usr/local/bin/replicate]"

-  subscribes :restart, "template[/etc/init.d/replicate]"
+  subscribes :restart, "systemd_service[replicate]"

 end
 
 template "/etc/logrotate.d/replicate" do
 end
 
 template "/etc/logrotate.d/replicate" do


@@ -473,21 +486,6 @@ template "/etc/cron.d/render-lowzoom" do
   mode 0o644
 end
 
   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
-
-template "/etc/logrotate.d/renderd" do
-  source "renderd.logrotate.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-end
-

 package "liblockfile-simple-perl"
 package "libfilesys-df-perl"
 
 package "liblockfile-simple-perl"
 package "libfilesys-df-perl"