X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0e95d80e29d91ead2a078ee13682268c28e2ffc6..5844c5bc2edf22e4d6a4316f887adf758584a008:/cookbooks/planet/recipes/dump.rb diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb index e719e894a..94fd04e93 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,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" @@ -54,8 +55,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,9 +93,10 @@ directory "/store/planetdump" do owner "www-data" group "www-data" mode 0o755 + recursive true end -["planetdump", "planet-mirror-redirect-update"].each do |program| +%w[planetdump planet-mirror-redirect-update].each do |program| template "/usr/local/bin/#{program}" do source "#{program}.erb" owner "root"