X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/842193c1cb41f57515bb785120c61882eac99de4..fb76c1d60c2a71cc5a63f7e63e491beacbbf038e:/cookbooks/planet/recipes/dump.rb diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb index f4777a070..7a987eec7 100644 --- a/cookbooks/planet/recipes/dump.rb +++ b/cookbooks/planet/recipes/dump.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: planet +# Cookbook:: planet # Recipe:: dump # -# Copyright 2013, OpenStreetMap Foundation +# Copyright:: 2013, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -27,24 +27,27 @@ 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 + g++ + make + autoconf + automake + pkg-config + 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" @@ -54,8 +57,9 @@ end git "/opt/planet-dump-ng" do action :sync - repository "git://github.com/zerebubuth/planet-dump-ng.git" + repository "https://github.com/zerebubuth/planet-dump-ng.git" revision "v1.1.6" + depth 1 user "root" group "root" end @@ -91,6 +95,7 @@ directory "/store/planetdump" do owner "www-data" group "www-data" mode 0o755 + recursive true end %w[planetdump planet-mirror-redirect-update].each do |program|