From: Tom Hughes <tom@compton.nu>
Date: Wed, 4 Sep 2024 21:41:49 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/692'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/7818690d6c926bad3e0f6a2e79b4e0a2a9c350b7?hp=fe3288c93f9fd2d0a699357010d4534027d4deaf

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 2ebcbf041..4f067ee68 100644
--- 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
index 000000000..e5efe3340
--- /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