Fix mediawiki cookbook dependencies

diff --git a/.kitchen.yml b/.kitchen.yml
index 1f71e92cd36109cc78ea7783062518d3281920b3..994885126ed72373e9cbbbf43bf3bb1e68b5f23b 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -320,13 +320,9 @@ suites:
   - name: web-rails
     run_list:
       - recipe[web::rails]
   - name: web-rails
     run_list:
       - recipe[web::rails]

+  - name: wiki
+    run_list:
+      - recipe[wiki::default]

   - name: wordpress
     run_list:
       - recipe[wordpress::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 9df8048079287980de97d44bb3500bac0428839e..03571ce4a91753fcc51f70497f537388dc126868 100644 (file)
--- 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"
 
 version           "1.0.0"
 supports          "ubuntu"

-depends           "memcached"
+depends           "accounts"

 depends           "apache"
 depends           "apache"

-depends           "mysql"
+depends           "apt"

 depends           "git"
 depends           "git"

+depends           "memcached"
+depends           "mysql"

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 27c7cb48fe1b228a4b076345c67b78774fbb2c5a..4466250b94836dd5d3ec865dc37848fb91437d74 100644 (file)
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -17,10 +17,12 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "memcached"
+include_recipe "accounts"

 include_recipe "apache"
 include_recipe "apache"

-include_recipe "mysql"
+include_recipe "apt"

 include_recipe "git"
 include_recipe "git"

+include_recipe "memcached"
+include_recipe "mysql"

 
 # Mediawiki Base Requirements
 package %w[
 
 # Mediawiki Base Requirements
 package %w[