From 52cd38fa82f0eb1febb5cca9ddbf62253e15e620 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 9 Nov 2022 15:59:23 +0000 Subject: [PATCH] Install tar and unzip unconditionally on tile servers --- cookbooks/tile/recipes/default.rb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb index ceacd8b4f..fe5934a61 100644 --- a/cookbooks/tile/recipes/default.rb +++ b/cookbooks/tile/recipes/default.rb @@ -199,7 +199,11 @@ directory "/srv/tile.openstreetmap.org/data" do mode "755" end -package "mapnik-utils" +package %w[ + mapnik-utils + tar + unzip +] node[:tile][:data].each_value do |data| url = data[:url] @@ -218,8 +222,6 @@ node[:tile][:data].each_value do |data| end if file =~ /\.tgz$/ - package "tar" - execute file do action :nothing command "tar -zxf #{file} -C #{directory}" @@ -227,8 +229,6 @@ node[:tile][:data].each_value do |data| group "tile" end elsif file =~ /\.tar\.bz2$/ - package "tar" - execute file do action :nothing command "tar -jxf #{file} -C #{directory}" @@ -236,8 +236,6 @@ node[:tile][:data].each_value do |data| group "tile" end elsif file =~ /\.zip$/ - package "unzip" - execute file do action :nothing command "unzip -qq -o #{file} -d #{directory}" -- 2.43.2