Unbreak code.

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 675f8e7df0a17cb92ed7567787d1e89753cb4f31..4bfbcb455140cf4f76d709dadf25b927c0f8e169 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -26,6 +26,7 @@ include_recipe "tools"
 blocks = data_bag_item("tile", "blocks")
 
 apache_module "alias"
 blocks = data_bag_item("tile", "blocks")
 
 apache_module "alias"

+apache_module "cgi"

 apache_module "expires"
 apache_module "headers"
 apache_module "remoteip"
 apache_module "expires"
 apache_module "headers"
 apache_module "remoteip"


@@ -38,7 +39,7 @@ end
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 
 apache_site "default" do
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 
 apache_site "default" do

-  action [ :disable ]
+  action [:disable]

 end
 
 apache_site "tile.openstreetmap.org" do
 end
 
 apache_site "tile.openstreetmap.org" do


@@ -50,33 +51,47 @@ template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
   source "logrotate.apache.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 
 directory "/srv/tile.openstreetmap.org" do
   owner "tile"
   group "tile"
 end
 
 directory "/srv/tile.openstreetmap.org" do
   owner "tile"
   group "tile"

-  mode 0755
+  mode 0o755

 end
 
 package "renderd"
 
 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
 service "renderd" do

-  action [ :enable, :start ]
-  supports :status => false, :restart => true, :reload => false
+  action [:enable, :start]

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

-  mode 0755
+  mode 0o755

 end
 
 template "/etc/renderd.conf" do
   source "renderd.conf.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/renderd.conf" do
   source "renderd.conf.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   notifies :reload, "service[apache2]"
   notifies :restart, "service[renderd]"
 end
   notifies :reload, "service[apache2]"
   notifies :restart, "service[renderd]"
 end


@@ -85,43 +100,44 @@ remote_directory "/srv/tile.openstreetmap.org/html" do
   source "html"
   owner "tile"
   group "tile"
   source "html"
   owner "tile"
   group "tile"

-  mode 0755
+  mode 0o755

   files_owner "tile"
   files_group "tile"
   files_owner "tile"
   files_group "tile"

-  files_mode 0644
+  files_mode 0o644

 end
 
 template "/srv/tile.openstreetmap.org/html/index.html" do
   source "index.html.erb"
   owner "tile"
   group "tile"
 end
 
 template "/srv/tile.openstreetmap.org/html/index.html" do
   source "index.html.erb"
   owner "tile"
   group "tile"

-  mode 0644
+  mode 0o644

 end
 
 package "python-cairo"
 package "python-mapnik"
 
 package "ttf-dejavu"
 end
 
 package "python-cairo"
 package "python-mapnik"
 
 package "ttf-dejavu"

-package "fonts-droid"

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

+package "fonts-droid-fallback"

 package "fonts-sipa-arundina"
 package "fonts-sil-padauk"
 package "fonts-khmeros"
 package "fonts-sipa-arundina"
 package "fonts-sil-padauk"
 package "fonts-khmeros"

-package "ttf-indic-fonts-core"
-package "ttf-tamil-fonts"
-package "ttf-kannada-fonts"
+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"

-  mode 0755
+  mode 0o755

 end
 
 template "/srv/tile.openstreetmap.org/cgi-bin/export" do
   source "export.erb"
   owner "tile"
   group "tile"
 end
 
 template "/srv/tile.openstreetmap.org/cgi-bin/export" do
   source "export.erb"
   owner "tile"
   group "tile"

-  mode 0755
+  mode 0o755

   variables :blocks => blocks
 end
 
   variables :blocks => blocks
 end
 


@@ -129,31 +145,38 @@ template "/srv/tile.openstreetmap.org/cgi-bin/debug" do
   source "debug.erb"
   owner "tile"
   group "tile"
   source "debug.erb"
   owner "tile"
   group "tile"

-  mode 0755
+  mode 0o755

 end
 
 template "/etc/cron.hourly/export" do
   source "export.cron.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/cron.hourly/export" do
   source "export.cron.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 directory "/srv/tile.openstreetmap.org/data" do
   owner "tile"
   group "tile"
 end
 
 directory "/srv/tile.openstreetmap.org/data" do
   owner "tile"
   group "tile"

-  mode 0755
+  mode 0o755

 end
 
 end
 

+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 0755
+  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$/


@@ -185,21 +208,6 @@ node[:tile][:data].each_value do |data|
     end
   end
 
     end
   end
 

-  if data[:processed]
-    original = "#{directory}/#{data[:original]}"
-    processed = "#{directory}/#{data[:processed]}"
-
-    package "gdal-bin"
-
-    execute processed do
-      action :nothing
-      command "ogr2ogr #{processed} #{original}"
-      user "tile"
-      group "tile"
-      subscribes :run, "execute[#{file}]", :immediately
-    end
-  end
-

   execute "#{file}_shapeindex" do
     action :nothing
     command "find #{directory} -type f -iname '*.shp' -print0 | xargs -0 --no-run-if-empty shapeindex --shape_files"
   execute "#{file}_shapeindex" do
     action :nothing
     command "find #{directory} -type f -iname '*.shp' -print0 | xargs -0 --no-run-if-empty shapeindex --shape_files"


@@ -212,6 +220,7 @@ node[:tile][:data].each_value do |data|
     if data[:refresh]
       action :create
       use_conditional_get true
     if data[:refresh]
       action :create
       use_conditional_get true

+      ignore_failure true

     else
       action :create_if_missing
     end
     else
       action :create_if_missing
     end


@@ -219,7 +228,7 @@ node[:tile][:data].each_value do |data|
     source url
     owner "tile"
     group "tile"
     source url
     owner "tile"
     group "tile"

-    mode 0644
+    mode 0o644

     backup false
     notifies :run, "execute[#{file}]", :immediately
     notifies :restart, "service[renderd]"
     backup false
     notifies :run, "execute[#{file}]", :immediately
     notifies :restart, "service[renderd]"


@@ -232,7 +241,7 @@ nodejs_package "millstone"
 directory "/srv/tile.openstreetmap.org/styles" do
   owner "tile"
   group "tile"
 directory "/srv/tile.openstreetmap.org/styles" do
   owner "tile"
   group "tile"

-  mode 0755
+  mode 0o755

 end
 
 node[:tile][:styles].each do |name, details|
 end
 
 node[:tile][:styles].each do |name, details|


@@ -243,7 +252,7 @@ node[:tile][:styles].each do |name, details|
     source "update-lowzoom.erb"
     owner "root"
     group "root"
     source "update-lowzoom.erb"
     owner "root"
     group "root"

-    mode 0755
+    mode 0o755

     variables :style => name
   end
 
     variables :style => name
   end
 


@@ -251,7 +260,7 @@ node[:tile][:styles].each do |name, details|
     source "update-lowzoom.init.erb"
     owner "root"
     group "root"
     source "update-lowzoom.init.erb"
     owner "root"
     group "root"

-    mode 0755
+    mode 0o755

     variables :style => name
   end
 
     variables :style => name
   end
 


@@ -263,21 +272,21 @@ node[:tile][:styles].each do |name, details|
   directory tile_directory do
     owner "tile"
     group "tile"
   directory tile_directory do
     owner "tile"
     group "tile"

-    mode 0755
+    mode 0o755

   end
 
   details[:tile_directories].each do |directory|
     directory directory[:name] do
       owner "www-data"
       group "www-data"
   end
 
   details[:tile_directories].each do |directory|
     directory directory[:name] do
       owner "www-data"
       group "www-data"

-      mode 0755
+      mode 0o755

     end
 
     directory[:min_zoom].upto(directory[:max_zoom]) do |zoom|
       directory "#{directory[:name]}/#{zoom}" do
         owner "www-data"
         group "www-data"
     end
 
     directory[:min_zoom].upto(directory[:max_zoom]) do |zoom|
       directory "#{directory[:name]}/#{zoom}" do
         owner "www-data"
         group "www-data"

-        mode 0755
+        mode 0o755

       end
 
       link "#{tile_directory}/#{zoom}" do
       end
 
       link "#{tile_directory}/#{zoom}" do


@@ -292,7 +301,7 @@ node[:tile][:styles].each do |name, details|
     action :create_if_missing
     owner "tile"
     group "tile"
     action :create_if_missing
     owner "tile"
     group "tile"

-    mode 0444
+    mode 0o444

   end
 
   git style_directory do
   end
 
   git style_directory do


@@ -377,120 +386,109 @@ end
 file node[:tile][:node_file] do
   owner "tile"
   group "www-data"
 file node[:tile][:node_file] do
   owner "tile"
   group "www-data"

-  mode 0640
+  mode 0o640

 end
 
 directory "/var/log/tile" do
   owner "tile"
   group "tile"
 end
 
 directory "/var/log/tile" do
   owner "tile"
   group "tile"

-  mode 0755
+  mode 0o755

 end
 
 package "osm2pgsql"
 package "osmosis"
 
 package "ruby"
 end
 
 package "osm2pgsql"
 package "osmosis"
 
 package "ruby"

-package "rubygems"
+package "ruby-dev"

 
 package "libproj-dev"
 package "libxml2-dev"
 
 gem_package "proj4rb"
 gem_package "libxml-ruby"
 
 package "libproj-dev"
 package "libxml2-dev"
 
 gem_package "proj4rb"
 gem_package "libxml-ruby"

-gem_package "mmap"

 
 remote_directory "/usr/local/lib/site_ruby" do
   source "ruby"
   owner "root"
   group "root"
 
 remote_directory "/usr/local/lib/site_ruby" do
   source "ruby"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

   files_owner "root"
   files_group "root"
   files_owner "root"
   files_group "root"

-  files_mode 0644
+  files_mode 0o644

 end
 
 template "/usr/local/bin/expire-tiles" do
   source "expire-tiles.erb"
   owner "root"
   group "root"
 end
 
 template "/usr/local/bin/expire-tiles" do
   source "expire-tiles.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 template "/etc/sudoers.d/tile" do
   source "sudoers.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/sudoers.d/tile" do
   source "sudoers.erb"
   owner "root"
   group "root"

-  mode 0440
+  mode 0o440

 end
 
 directory "/var/lib/replicate" do
   owner "tile"
   group "tile"
 end
 
 directory "/var/lib/replicate" do
   owner "tile"
   group "tile"

-  mode 0755
+  mode 0o755

 end
 
 template "/var/lib/replicate/configuration.txt" do
   source "replicate.configuration.erb"
   owner "tile"
   group "tile"
 end
 
 template "/var/lib/replicate/configuration.txt" do
   source "replicate.configuration.erb"
   owner "tile"
   group "tile"

-  mode 0644
+  mode 0o644

 end
 
 template "/usr/local/bin/replicate" do
   source "replicate.erb"
   owner "root"
   group "root"
 end
 
 template "/usr/local/bin/replicate" do
   source "replicate.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 end
 

-template "/etc/init.d/replicate" do
-  source "replicate.init.erb"
-  owner "root"
-  group "root"
-  mode 0755
+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
 end
 
 service "replicate" do

-  action [ :enable, :start ]
-  supports :restart => true
+  action [:enable, :start]

   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
   source "replicate.logrotate.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/logrotate.d/replicate" do
   source "replicate.logrotate.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 
 template "/usr/local/bin/render-lowzoom" do
   source "render-lowzoom.erb"
   owner "root"
   group "root"
 end
 
 template "/usr/local/bin/render-lowzoom" do
   source "render-lowzoom.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 template "/etc/cron.d/render-lowzoom" do
   source "render-lowzoom.cron.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/cron.d/render-lowzoom" do
   source "render-lowzoom.cron.erb"
   owner "root"
   group "root"

-  mode 0644
-end
-
-template "/etc/rsyslog.d/20-renderd.conf" do
-  source "renderd.rsyslog.erb"
-  owner "root"
-  group "root"
-  mode 0644
-  notifies :restart, "service[rsyslog]"
-end
-
-template "/etc/logrotate.d/renderd" do
-  source "renderd.logrotate.erb"
-  owner "root"
-  group "root"
-  mode 0644
+  mode 0o644

 end
 
 package "liblockfile-simple-perl"
 end
 
 package "liblockfile-simple-perl"


@@ -500,7 +498,7 @@ template "/usr/local/bin/cleanup-tiles" do
   source "cleanup-tiles.erb"
   owner "root"
   group "root"
   source "cleanup-tiles.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 tile_directories = node[:tile][:styles].collect do |_, style|
 end
 
 tile_directories = node[:tile][:styles].collect do |_, style|


@@ -511,7 +509,7 @@ template "/etc/cron.d/cleanup-tiles" do
   source "cleanup-tiles.cron.erb"
   owner "root"
   group "root"
   source "cleanup-tiles.cron.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   variables :directories => tile_directories
 end
 
   variables :directories => tile_directories
 end