vectortile: make enabled a boolean

diff --git a/cookbooks/vectortile/attributes/default.rb b/cookbooks/vectortile/attributes/default.rb
index 912b7ee2518fee2e9666fd37dc3555ad50e233af..4ec9120d25821e18e68215f026c00f7185a00c9e 100644 (file)
--- a/cookbooks/vectortile/attributes/default.rb
+++ b/cookbooks/vectortile/attributes/default.rb
@@ -4,8 +4,8 @@ default[:vectortile][:database][:nodes_store] = :flat
 default[:vectortile][:serve][:threads] = node.cpu_cores
 default[:vectortile][:serve][:mode] = :live
 default[:vectortile][:replication][:url] = "https://osm-planet-eu-central-1.s3.dualstack.eu-central-1.amazonaws.com/planet/replication/minute"
 default[:vectortile][:serve][:threads] = node.cpu_cores
 default[:vectortile][:serve][:mode] = :live
 default[:vectortile][:replication][:url] = "https://osm-planet-eu-central-1.s3.dualstack.eu-central-1.amazonaws.com/planet/replication/minute"

-default[:vectortile][:replication][:status] = :enabled
-default[:vectortile][:replication][:tileupdate] = :enabled
+default[:vectortile][:replication][:enabled] = true
+default[:vectortile][:replication][:tileupdate] = true

 default[:vectortile][:replication][:threads] = node.cpu_cores
 
 default[:vectortile][:tilekiln][:version] = "0.6.5"
 default[:vectortile][:replication][:threads] = node.cpu_cores
 
 default[:vectortile][:tilekiln][:version] = "0.6.5"

diff --git a/cookbooks/vectortile/recipes/default.rb b/cookbooks/vectortile/recipes/default.rb
index 703407f11510fdcfff47ccb520997dab47350816..feda712a0ba3f0599b35b5ca4adad035eab64463 100644 (file)
--- a/cookbooks/vectortile/recipes/default.rb
+++ b/cookbooks/vectortile/recipes/default.rb
@@ -246,7 +246,7 @@ execute "/srv/vector.openstreetmap.org/spirit/scripts/get-external-data.py" do
 end
 
 template "/usr/local/bin/vector-update" do
 end
 
 template "/usr/local/bin/vector-update" do

-  source node[:vectortile][:replication][:tileupdate] == :enabled ? "vector-update-tile.erb" : "vector-update-notile.erb"
+  source node[:vectortile][:replication][:tileupdate] ? "vector-update-tile.erb" : "vector-update-notile.erb"

   owner "root"
   group "root"
   mode "755"
   owner "root"
   group "root"
   mode "755"


@@ -279,7 +279,7 @@ systemd_timer "replicate" do
   accuracy_sec 5
 end
 
   accuracy_sec 5
 end
 

-if node[:vectortile][:replication][:status] == :enabled
+if node[:vectortile][:replication][:enabled]

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

diff --git a/roles/dribble.rb b/roles/dribble.rb
index fb68919f4552d0bc9557365dfb1358a8acd806ee..cb592383de4eb5463ea5924a3af85dea7158392b 100644 (file)
--- a/roles/dribble.rb
+++ b/roles/dribble.rb
@@ -58,10 +58,6 @@ default_attributes(
     }
   },
   :vectortile => {
     }
   },
   :vectortile => {

-    :replication => {
-      :status => :enabled,
-      :tileupdate => :enabled
-    },

     :tilekiln => {
       :version => "0.7.0"
     }
     :tilekiln => {
       :version => "0.7.0"
     }