Install g++ for building planet-dump-ng

[chef.git] / cookbooks / planet / recipes / dump.rb

diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index 0eb5cef0d43e857ddef985d7e3e64ba2f6347187..327ddc38ff516d16662fc03e8da9d5807661d315 100644 (file)
--- a/cookbooks/planet/recipes/dump.rb
+++ b/cookbooks/planet/recipes/dump.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: planet
+# Cookbook:: planet

 # Recipe:: dump
 #
 # 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.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -27,24 +27,26 @@ node.default[:incron][:planetdump] = {
 include_recipe "git"
 include_recipe "incron"
 
 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
+  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"
 
 directory "/opt/planet-dump-ng" do
   owner "root"


@@ -54,8 +56,9 @@ end
 
 git "/opt/planet-dump-ng" do
   action :sync
 
 git "/opt/planet-dump-ng" do
   action :sync

-  repository "git://github.com/zerebubuth/planet-dump-ng.git"
-  revision "v1.1.4"
+  repository "https://github.com/zerebubuth/planet-dump-ng.git"
+  revision "v1.1.6"
+  depth 1

   user "root"
   group "root"
 end
   user "root"
   group "root"
 end


@@ -91,9 +94,10 @@ directory "/store/planetdump" do
   owner "www-data"
   group "www-data"
   mode 0o755
   owner "www-data"
   group "www-data"
   mode 0o755

+  recursive true

 end
 
 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"
   template "/usr/local/bin/#{program}" do
     source "#{program}.erb"
     owner "root"