Merge pull request #308 from Firefishy/more-404-tiles

[chef.git] / cookbooks / mediawiki / recipes / default.rb

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 63c9d53db500f643ba2f73dadd627975f0549b87..f6cea2d269bdd4626972b21b36fb8f952ab7cafb 100644 (file)
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: mediawiki
+# Cookbook:: mediawiki

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,14 +17,16 @@
 # 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"
+include_recipe "php::apache"

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

-  php

   php-cli
   php-curl
   php-gd
   php-cli
   php-curl
   php-gd


@@ -32,6 +34,8 @@ package %w[
   php-mbstring
   php-mysql
   php-xml
   php-mbstring
   php-mysql
   php-xml

+  php-zip
+  composer

 ]
 
 # Mediawiki enhanced difference engine
 ]
 
 # Mediawiki enhanced difference engine


@@ -82,9 +86,7 @@ service "parsoid" do
   subscribes :restart, "template[/etc/mediawiki/parsoid/config.yaml]"
 end
 
   subscribes :restart, "template[/etc/mediawiki/parsoid/config.yaml]"
 end
 

-apache_module "php7.0"
-
-link "/etc/php/7.0/apache2/conf.d/20-wikidiff2.ini" do
+link "/etc/php/#{node[:php][:version]}/apache2/conf.d/20-wikidiff2.ini" do

   to "../../mods-available/wikidiff2.ini"
 end
 
   to "../../mods-available/wikidiff2.ini"
 end