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

diff --git a/Gemfile.lock b/Gemfile.lock
index 927637a28d06ff669b7e0cbcd7c6ef34833cbb19..900b7d8ec811f8f30a0c61419afe2f2998dd65c9 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -103,8 +103,9 @@ GEM
       unicode-display_width (~> 1.5)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
-    test-kitchen (2.10.0)
+    test-kitchen (2.11.0)
       bcrypt_pbkdf (~> 1.0)
+      chef-utils (>= 16.4.35)
       ed25519 (~> 1.2)
       license-acceptance (>= 1.0.11, < 3.0)
       mixlib-install (~> 3.6)

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 6946918f172a68bdecec424bf10bef723ec60ac6..bb08987c70709e0a2b630e0412328e9c061363b5 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -402,7 +402,8 @@ ssl_certificate node[:fqdn] do
            "nominatim.openstreetmap.com",
            "nominatim.openstreetmap.net",
            "nominatim.openstreetmaps.org",
-           "nominatim.openmaps.org"]
+           "nominatim.openmaps.org",
+           "nominatim.qgis.org"]
   notifies :reload, "service[nginx]"
 end