From: Tom Hughes <tom@compton.nu>
Date: Tue, 14 Jun 2022 17:59:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/496'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/0c78091245e5299e4856bf696edd9a5d44e3e4c7?hp=fdbe305f627ab26b604cd6b7b9a1f372083e35bd

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 89c35fd9a..21968a17b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,23 +4,24 @@ GEM
     ast (2.4.2)
     bcrypt_pbkdf (1.1.0)
     builder (3.2.4)
-    chef-utils (17.8.25)
+    chef-utils (17.10.0)
       concurrent-ruby
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     cookstyle (7.32.1)
       rubocop (= 1.25.1)
     diff-lcs (1.5.0)
     docker-api (2.2.0)
       excon (>= 0.47.0)
       multi_json
-    ed25519 (1.2.4)
+    ed25519 (1.3.0)
     erubi (1.10.0)
     excon (0.88.0)
-    ffi (1.15.4)
+    ffi (1.15.5)
     gssapi (1.3.1)
       ffi (>= 1.0.1)
-    gyoku (1.3.1)
+    gyoku (1.4.0)
       builder (>= 2.1.2)
+      rexml (~> 3.0)
     httpclient (2.8.3)
     kitchen-dokken (2.17.0)
       docker-api (>= 1.33, < 3)
@@ -33,14 +34,14 @@ GEM
       tty-prompt (~> 0.20)
     little-plugger (1.1.4)
     lockfile (2.1.3)
-    logging (2.3.0)
+    logging (2.3.1)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
-    mixlib-install (3.12.16)
+    mixlib-install (3.12.19)
       mixlib-shellout
       mixlib-versioning
       thor
-    mixlib-shellout (3.2.5)
+    mixlib-shellout (3.2.7)
       chef-utils
     mixlib-versioning (1.2.12)
     multi_json (1.15.0)
@@ -105,7 +106,7 @@ GEM
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
-    test-kitchen (3.2.2)
+    test-kitchen (3.3.0)
       bcrypt_pbkdf (~> 1.0)
       chef-utils (>= 16.4.35)
       ed25519 (~> 1.2)
@@ -119,8 +120,8 @@ GEM
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.1)
-    thor (1.1.0)
-    tomlrb (2.0.1)
+    thor (1.2.1)
+    tomlrb (2.0.3)
     tty-box (0.7.0)
       pastel (~> 0.8)
       strings (~> 0.2.0)
diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index e13ca7f32..d1ee1a7d5 100644
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -72,6 +72,7 @@ wordpress_plugin "blog.openstreetmap.org-sitepress-multilingual-cms" do
   plugin "sitepress-multilingual-cms"
   site "blog.openstreetmap.org"
   repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
+  revision "master"
   not_if { kitchen? }
 end
 
diff --git a/cookbooks/community/templates/default/web_only.yml.erb b/cookbooks/community/templates/default/web_only.yml.erb
index 6733f3bcf..b70599f59 100644
--- a/cookbooks/community/templates/default/web_only.yml.erb
+++ b/cookbooks/community/templates/default/web_only.yml.erb
@@ -21,7 +21,7 @@ links:
 
 # Workaround bug: https://github.com/discourse/discourse_docker/pull/505
 # params:
-#  version: v2.8.1
+#  version: v2.8.4
 
 env:
   LC_ALL: en_US.UTF-8
@@ -97,8 +97,8 @@ hooks:
     - exec:
         cd: $home
         cmd:
-          - git fetch --depth=1 origin tag v2.8.3 --no-tags
-          - git checkout v2.8.3
+          - git fetch --depth=1 origin tag v2.8.4 --no-tags
+          - git checkout v2.8.4
   after_ssl:
     - replace:
         filename: "/etc/nginx/conf.d/discourse.conf"
diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index c341691d1..b27f7c11b 100644
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -95,6 +95,7 @@ $wgFileExtensions[] = 'odp';
 $wgFileExtensions[] = 'ods';
 $wgFileExtensions[] = 'svg';
 $wgFileExtensions[] = 'osm';
+$wgFileExtensions[] = 'odg';
 <% @mediawiki[:extra_file_extensions].each do |mw_extra_file_extension| -%>
 	$wgFileExtensions[] = '<%= mw_extra_file_extension %>';
 <% end -%>
diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index 23ce45dfd..37217d919 100644
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -173,6 +173,7 @@ wordpress_plugin "2010.stateofthemap.org-sitepress-multilingual-cms" do
   plugin "sitepress-multilingual-cms"
   site "2010.stateofthemap.org"
   repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
+  revision "master"
   not_if { kitchen? }
 end
 
@@ -217,6 +218,7 @@ wordpress_plugin "2011.stateofthemap.org-sitepress-multilingual-cms" do
   plugin "sitepress-multilingual-cms"
   site "2011.stateofthemap.org"
   repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
+  revision "master"
   not_if { kitchen? }
 end
 
@@ -266,6 +268,7 @@ wordpress_plugin "2012.stateofthemap.org-sitepress-multilingual-cms" do
   plugin "sitepress-multilingual-cms"
   site "2012.stateofthemap.org"
   repository "https://git.openstreetmap.org/private/sitepress-multilingual-cms.git"
+  revision "master"
   not_if { kitchen? }
 end
 
diff --git a/cookbooks/wordpress/resources/plugin.rb b/cookbooks/wordpress/resources/plugin.rb
index 82c7ae5e2..881caee63 100644
--- a/cookbooks/wordpress/resources/plugin.rb
+++ b/cookbooks/wordpress/resources/plugin.rb
@@ -49,7 +49,6 @@ action :create do
         action :sync
         repository plugin_repository
         revision new_resource.revision
-        depth 1
         user node[:wordpress][:user]
         group node[:wordpress][:group]
       end
diff --git a/cookbooks/wordpress/resources/theme.rb b/cookbooks/wordpress/resources/theme.rb
index 994cf1223..5a402f6d1 100644
--- a/cookbooks/wordpress/resources/theme.rb
+++ b/cookbooks/wordpress/resources/theme.rb
@@ -49,7 +49,6 @@ action :create do
         action :sync
         repository theme_repository
         revision new_resource.revision
-        depth 1
         user node[:wordpress][:user]
         group node[:wordpress][:group]
       end