From dd049724ae357550840e0460de1074960d203c27 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 18 Mar 2020 20:11:34 +0000
Subject: [PATCH] Fix mediawiki cookbook dependencies

---
 .kitchen.yml                           | 10 +++-------
 cookbooks/mediawiki/metadata.rb        |  6 ++++--
 cookbooks/mediawiki/recipes/default.rb |  6 ++++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.kitchen.yml b/.kitchen.yml
index 1f71e92cd..994885126 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -320,13 +320,9 @@ suites:
   - name: web-rails
     run_list:
       - recipe[web::rails]
+  - name: wiki
+    run_list:
+      - recipe[wiki::default]
   - name: wordpress
     run_list:
       - recipe[wordpress::default]
-  - name: wiki
-    run_list:
-      - recipe[apt::default]
-      - recipe[accounts::default]
-      - recipe[munin::default]
-      - recipe[wiki]
-      - role[wiki]
diff --git a/cookbooks/mediawiki/metadata.rb b/cookbooks/mediawiki/metadata.rb
index 9df804807..03571ce4a 100644
--- a/cookbooks/mediawiki/metadata.rb
+++ b/cookbooks/mediawiki/metadata.rb
@@ -6,7 +6,9 @@ description       "Installs and configures mediawiki"
 
 version           "1.0.0"
 supports          "ubuntu"
-depends           "memcached"
+depends           "accounts"
 depends           "apache"
-depends           "mysql"
+depends           "apt"
 depends           "git"
+depends           "memcached"
+depends           "mysql"
diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 27c7cb48f..4466250b9 100644
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -17,10 +17,12 @@
 # limitations under the License.
 #
 
-include_recipe "memcached"
+include_recipe "accounts"
 include_recipe "apache"
-include_recipe "mysql"
+include_recipe "apt"
 include_recipe "git"
+include_recipe "memcached"
+include_recipe "mysql"
 
 # Mediawiki Base Requirements
 package %w[
-- 
2.39.5