Harden forum web server config

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 85af49c46e8ad01524b57f5bee41e559d1d0a2c3..0a703017cc8452fbe28c2d46260385227e6a7e71 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"
+apache_module "cgi"
 apache_module "expires"
 apache_module "headers"
 apache_module "remoteip"
@@ -50,13 +51,13 @@ template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 directory "/srv/tile.openstreetmap.org" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 package "renderd"
@@ -69,14 +70,14 @@ 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"
-  mode 0644
+  mode 0o644
   notifies :reload, "service[apache2]"
   notifies :restart, "service[renderd]"
 end
@@ -85,43 +86,50 @@ remote_directory "/srv/tile.openstreetmap.org/html" do
   source "html"
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
   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"
-  mode 0644
+  mode 0o644
 end
 
 package "python-cairo"
 package "python-mapnik"
 
 package "ttf-dejavu"
-package "fonts-droid"
 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 "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"
-  mode 0755
+  mode 0o755
 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
 
@@ -129,20 +137,20 @@ template "/srv/tile.openstreetmap.org/cgi-bin/debug" do
   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"
-  mode 0755
+  mode 0o755
 end
 
 directory "/srv/tile.openstreetmap.org/data" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 package "mapnik-utils"
@@ -150,12 +158,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 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$/
@@ -187,21 +200,6 @@ node[:tile][:data].each_value do |data|
     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"
@@ -214,6 +212,7 @@ node[:tile][:data].each_value do |data|
     if data[:refresh]
       action :create
       use_conditional_get true
+      ignore_failure true
     else
       action :create_if_missing
     end
@@ -221,7 +220,7 @@ node[:tile][:data].each_value do |data|
     source url
     owner "tile"
     group "tile"
-    mode 0644
+    mode 0o644
     backup false
     notifies :run, "execute[#{file}]", :immediately
     notifies :restart, "service[renderd]"
@@ -234,7 +233,7 @@ nodejs_package "millstone"
 directory "/srv/tile.openstreetmap.org/styles" do
   owner "tile"
   group "tile"
-  mode 0755
+  mode 0o755
 end
 
 node[:tile][:styles].each do |name, details|
@@ -245,7 +244,7 @@ node[:tile][:styles].each do |name, details|
     source "update-lowzoom.erb"
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
     variables :style => name
   end
 
@@ -253,7 +252,7 @@ node[:tile][:styles].each do |name, details|
     source "update-lowzoom.init.erb"
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
     variables :style => name
   end
 
@@ -265,21 +264,21 @@ node[:tile][:styles].each do |name, details|
   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"
-      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"
-        mode 0755
+        mode 0o755
       end
 
       link "#{tile_directory}/#{zoom}" do
@@ -294,7 +293,7 @@ node[:tile][:styles].each do |name, details|
     action :create_if_missing
     owner "tile"
     group "tile"
-    mode 0444
+    mode 0o444
   end
 
   git style_directory do
@@ -379,77 +378,76 @@ end
 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"
-  mode 0755
+  mode 0o755
 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"
-gem_package "mmap"
 
 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_mode 0644
+  files_mode 0o644
 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"
-  mode 0440
+  mode 0o440
 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"
-  mode 0644
+  mode 0o644
 end
 
 template "/usr/local/bin/replicate" do
   source "replicate.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/init.d/replicate" do
   source "replicate.init.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 service "replicate" do
@@ -463,36 +461,47 @@ 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"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/cron.d/render-lowzoom" do
   source "render-lowzoom.cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
-template "/etc/rsyslog.d/20-renderd.conf" do
-  source "renderd.rsyslog.erb"
-  owner "root"
-  group "root"
-  mode 0644
-  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 0644
+  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"
@@ -502,7 +511,7 @@ template "/usr/local/bin/cleanup-tiles" do
   source "cleanup-tiles.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 tile_directories = node[:tile][:styles].collect do |_, style|
@@ -513,7 +522,7 @@ template "/etc/cron.d/cleanup-tiles" do
   source "cleanup-tiles.cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :directories => tile_directories
 end