Merge remote-tracking branch 'github/pull/692'

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 2ebcbf041376ac00102ff9fc43b4bb7cd1884477..4f067ee688b2d08f89a4aea98859101d36c0172c 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -505,6 +505,13 @@ directory "/var/log/tile" do
   mode "755"
 end
 
+if platform?("debian")
+  apt_preference "osm2pgsql" do
+    pin "release o=Debian Backports"
+    pin_priority "600"
+  end
+end
+
 package %w[
   osm2pgsql
   osmium-tool

diff --git a/test/integration/tile/inspec/osm2pgsql_spec.rb b/test/integration/tile/inspec/osm2pgsql_spec.rb
new file mode 100644 (file)
index 0000000..e5efe33
--- /dev/null
+++ b/test/integration/tile/inspec/osm2pgsql_spec.rb
@@ -0,0 +1,4 @@
+describe package("osm2pgsql") do
+  it { should be_installed }
+  its("version") { should cmp >= "1.11.0" }
+end