dns: upgrade dnscontrol to 4.12.5

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 6cfe88d45f31ff69540737cbd908a0a365292b25..eab19d75dec8b81fc41d70879b06363f870c2377 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -20,7 +20,6 @@
 include_recipe "accounts"
 include_recipe "apache"
 include_recipe "git"
 include_recipe "accounts"
 include_recipe "apache"
 include_recipe "git"

-include_recipe "munin"

 include_recipe "nodejs"
 include_recipe "postgresql"
 include_recipe "prometheus"
 include_recipe "nodejs"
 include_recipe "postgresql"
 include_recipe "prometheus"


@@ -490,11 +489,6 @@ if node[:tile][:database][:external_data_script]
   end
 end
 
   end
 end
 

-postgresql_munin "gis" do
-  cluster node[:tile][:database][:cluster]
-  database "gis"
-end
-

 directory File.dirname(node[:tile][:database][:node_file]) do
   owner "root"
   group "root"
 directory File.dirname(node[:tile][:database][:node_file]) do
   owner "root"
   group "root"


@@ -520,12 +514,19 @@ package %w[
   pyosmium
 ]
 
   pyosmium
 ]
 

-directory "/var/lib/replicate" do
+directory node[:tile][:replication][:directory] do

   owner "tile"
   group "tile"
   mode "755"
 end
 
   owner "tile"
   group "tile"
   mode "755"
 end
 

+link "/var/lib/replicate" do
+  to node[:tile][:replication][:directory]
+  owner "tile"
+  group "tile"
+  not_if { node[:tile][:replication][:directory] == "/var/lib/replicate" }
+end
+

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


@@ -576,17 +577,6 @@ template "/usr/local/bin/replicate-post" do
   mode "755"
 end
 
   mode "755"
 end
 

-osm2pgsql_arguments = %w[
-    --number-processes=1
-    --log-progress=false
-    --expire-tiles=13-19
-    --expire-output=/var/lib/replicate/dirty-tiles.txt
-  ]
-
-osm2pgsql_arguments.append("--multi-geometry") if node[:tile][:database][:multi_geometry]
-osm2pgsql_arguments.append("--hstore") if node[:tile][:database][:hstore]
-osm2pgsql_arguments.append("--tag-transform-script=#{node[:tile][:database][:tag_transform_script]}") if node[:tile][:database][:tag_transform_script]
-

 systemd_service "replicate" do
   description "Rendering database replication service"
   after "postgresql.service"
 systemd_service "replicate" do
   description "Rendering database replication service"
   after "postgresql.service"


@@ -669,19 +659,6 @@ tile_directories.each do |directory|
   end
 end
 
   end
 end
 

-munin_plugin "mod_tile_fresh"
-munin_plugin "mod_tile_latency"
-munin_plugin "mod_tile_response"
-munin_plugin "mod_tile_zoom"
-
-munin_plugin "renderd_processed"
-munin_plugin "renderd_queue"
-munin_plugin "renderd_queue_time"
-munin_plugin "renderd_zoom"
-munin_plugin "renderd_zoom_time"
-
-munin_plugin "replication_delay"
-

 package "ruby-webrick"
 
 prometheus_exporter "modtile" do
 package "ruby-webrick"
 
 prometheus_exporter "modtile" do