X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/cd507bd2203f95ea8af4faf6c3128bd6df2b4666..6782e9d4eeaf925882a000a7423afa0633948213:/cookbooks/planet/recipes/dump.rb?ds=sidebyside diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb index 02f3ae350..4b7be0270 100644 --- a/cookbooks/planet/recipes/dump.rb +++ b/cookbooks/planet/recipes/dump.rb @@ -20,7 +20,7 @@ node.default[:incron][:planetdump] = { :user => "www-data", :path => "/store/backup", - :events => [ "IN_CREATE", "IN_MOVED_TO" ], + :events => %w(IN_CREATE IN_MOVED_TO), :command => "/usr/local/bin/planetdump $#" } @@ -39,11 +39,13 @@ package "libboost-filesystem-dev" package "libboost-thread-dev" package "libboost-iostreams-dev" package "libosmpbf-dev" -package "libleveldb-dev" -package "libsnappy-dev" package "libprotobuf-dev" package "osmpbf-bin" +# Add planet-mirror-redirect-update dependencies +package "php5-cli" +package "php5-curl" + directory "/opt/planet-dump-ng" do owner "root" group "root" @@ -53,7 +55,7 @@ end git "/opt/planet-dump-ng" do action :sync repository "git://github.com/zerebubuth/planet-dump-ng.git" - revision "master" + revision "v1.1.3" user "root" group "root" end @@ -69,7 +71,7 @@ end execute "/opt/planet-dump-ng/configure" do action :nothing - command "./configure --with-leveldb=/usr" + command "./configure" cwd "/opt/planet-dump-ng" user "root" group "root" @@ -91,9 +93,11 @@ directory "/store/planetdump" do mode 0755 end -template "/usr/local/bin/planetdump" do - source "planetdump.erb" - owner "root" - group "root" - mode 0755 +["planetdump", "planet-mirror-redirect-update", "apache-latest-planet-filename"].each do |program| + template "/usr/local/bin/#{program}" do + source "#{program}.erb" + owner "root" + group "root" + mode 0755 + end end