Allow mediawiki instances to access /dev/null

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 615afb84431f6a3b58e0bc2d9737f3df5562dbb7..fe3b6c8622543aa1935dfd7fac75794fd2a16f9e 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -21,6 +21,7 @@ include_recipe "apache"
 include_recipe "git"
 include_recipe "nodejs"
 include_recipe "postgresql"
 include_recipe "git"
 include_recipe "nodejs"
 include_recipe "postgresql"

+include_recipe "python"

 include_recipe "tools"
 
 blocks = data_bag_item("tile", "blocks")
 include_recipe "tools"
 
 blocks = data_bag_item("tile", "blocks")


@@ -37,6 +38,11 @@ apache_module "tile" do
   conf "tile.conf.erb"
 end
 
   conf "tile.conf.erb"
 end
 

+ssl_certificate node[:fqdn] do
+  domains [node[:fqdn], "tile.openstreetmap.org", "render.openstreetmap.org"]
+  notifies :reload, "service[apache2]"
+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


@@ -117,16 +123,31 @@ template "/srv/tile.openstreetmap.org/html/index.html" do
   mode 0o644
 end
 
   mode 0o644
 end
 

-package "python-cairo"
-package "python-mapnik"
-package "python-setuptools"
+package %w[
+  python-cairo
+  python-mapnik
+  python-setuptools
+]
+
+python_package "pyotp"

 
 

-easy_install_package "pyotp"
+package %w[
+  fonts-noto-cjk
+  fonts-noto-hinted
+  fonts-noto-unhinted
+  fonts-hanazono
+  ttf-unifont
+]

 
 

-package "fonts-noto-cjk"
-package "fonts-noto-hinted"
-package "fonts-noto-unhinted"
-package "ttf-unifont"
+["NotoSansArabicUI-Regular.ttf", "NotoSansArabicUI-Bold.ttf"].each do |font|
+  remote_file "/usr/share/fonts/truetype/noto/#{font}" do
+    action :create_if_missing
+    source "https://github.com/googlei18n/noto-fonts/raw/master/hinted/#{font}"
+    owner "root"
+    group "root"
+    mode 0o644
+  end
+end

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


@@ -242,7 +263,7 @@ nodejs_package "millstone"
 systemd_service "update-lowzoom@" do
   description "Low zoom tile update service for %i layer"
   user "tile"
 systemd_service "update-lowzoom@" do
   description "Low zoom tile update service for %i layer"
   user "tile"

-  exec_start "/usr/local/bin/update-lowzoom-%i"
+  exec_start "/bin/bash /usr/local/bin/update-lowzoom-%i"

   private_tmp true
   private_devices true
   private_network true
   private_tmp true
   private_devices true
   private_network true


@@ -337,9 +358,10 @@ node[:tile][:styles].each do |name, details|
 end
 
 postgresql_version = node[:tile][:database][:cluster].split("/").first
 end
 
 postgresql_version = node[:tile][:database][:cluster].split("/").first

+postgis_version = node[:tile][:database][:postgis]

 
 package "postgis"
 
 package "postgis"

-package "postgresql-#{postgresql_version}-postgis-2.3"
+package "postgresql-#{postgresql_version}-postgis-#{postgis_version}"

 
 postgresql_user "jburgess" do
   cluster node[:tile][:database][:cluster]
 
 postgresql_user "jburgess" do
   cluster node[:tile][:database][:cluster]


@@ -369,7 +391,12 @@ postgresql_extension "postgis" do
   database "gis"
 end
 
   database "gis"
 end
 

-%w(geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews spatial_ref_sys).each do |table|
+postgresql_extension "hstore" do
+  cluster node[:tile][:database][:cluster]
+  database "gis"
+end
+
+%w[geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews spatial_ref_sys].each do |table|

   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"
   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"


@@ -378,7 +405,7 @@ end
   end
 end
 
   end
 end
 

-%w(geometry_columns planet_osm_line planet_osm_point planet_osm_polygon planet_osm_roads).each do |table|
+%w[geometry_columns planet_osm_line planet_osm_point planet_osm_polygon planet_osm_roads].each do |table|

   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"
   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"


@@ -404,14 +431,20 @@ directory "/var/log/tile" do
   mode 0o755
 end
 
   mode 0o755
 end
 

-package "osm2pgsql"
-package "osmosis"
+package %w[
+  osm2pgsql
+  osmosis
+]

 
 

-package "ruby"
-package "ruby-dev"
+package %w[
+  ruby
+  ruby-dev
+]

 
 

-package "libproj-dev"
-package "libxml2-dev"
+package %w[
+  libproj-dev
+  libxml2-dev
+]

 
 gem_package "proj4rb"
 gem_package "libxml-ruby"
 
 gem_package "proj4rb"
 gem_package "libxml-ruby"


@@ -461,7 +494,7 @@ end
 
 systemd_service "expire-tiles" do
   description "Tile dirtying service"
 
 systemd_service "expire-tiles" do
   description "Tile dirtying service"

-  type "oneshot"
+  type "simple"

   user "www-data"
   exec_start "/usr/local/bin/expire-tiles"
   standard_output "null"
   user "www-data"
   exec_start "/usr/local/bin/expire-tiles"
   standard_output "null"