From: Tom Hughes <tom@compton.nu>
Date: Sat, 15 Feb 2020 12:05:56 +0000 (+0000)
Subject: Fix package dependencies in planet cookbook
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/aa1f26f044f0f2238f1cb0fdf8ec0879bc44d639?ds=sidebyside

Fix package dependencies in planet cookbook
---

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 5dd5953f8..ba5bf0023 100644
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -19,11 +19,10 @@
 
 include_recipe "apache"
 
-package "perl"
-package "pbzip2"
-package "osmosis"
-
-package "php-cli"
+package %w[
+  perl
+  php-cli
+]
 
 file "/etc/cron.d/planet" do
   action :delete
diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index 0b46a2c7b..a5e9a5fff 100644
--- a/cookbooks/planet/recipes/dump.rb
+++ b/cookbooks/planet/recipes/dump.rb
@@ -27,24 +27,25 @@ node.default[:incron][:planetdump] = {
 include_recipe "git"
 include_recipe "incron"
 
-package "gcc"
-package "make"
-package "autoconf"
-package "automake"
-package "libxml2-dev"
-package "libboost-dev"
-package "libboost-program-options-dev"
-package "libboost-date-time-dev"
-package "libboost-filesystem-dev"
-package "libboost-thread-dev"
-package "libboost-iostreams-dev"
-package "libosmpbf-dev"
-package "libprotobuf-dev"
-package "osmpbf-bin"
-
-# Add planet-mirror-redirect-update dependencies
-package "php-cli"
-package "php-curl"
+package %w[
+  gcc
+  make
+  autoconf
+  automake
+  libxml2-dev
+  libboost-dev
+  libboost-program-options-dev
+  libboost-date-time-dev
+  libboost-filesystem-dev
+  libboost-thread-dev
+  libboost-iostreams-dev
+  libosmpbf-dev
+  libprotobuf-dev
+  osmpbf-bin
+  pbzip2
+  php-cli
+  php-curl
+]
 
 directory "/opt/planet-dump-ng" do
   owner "root"
diff --git a/cookbooks/planet/recipes/notes.rb b/cookbooks/planet/recipes/notes.rb
index 41303fe43..c255c0962 100644
--- a/cookbooks/planet/recipes/notes.rb
+++ b/cookbooks/planet/recipes/notes.rb
@@ -21,8 +21,11 @@ include_recipe "git"
 
 db_passwords = data_bag_item("db", "passwords")
 
-package "python-psycopg2"
-package "python-lxml"
+package %w[
+  pbzip2
+  python-psycopg2
+  python-lxml
+]
 
 directory "/opt/planet-notes-dump" do
   owner "root"