From: Grant Slater <git@firefishy.com>
Date: Sat, 2 Jan 2016 08:49:37 +0000 (+0000)
Subject: mediawiki: Add initial parsoid support for visualeditor
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/e3d069c5375bb660a0a9e18a035baa5e6536a942?hp=d6047b6ed6cf6fafc6d5fce2065f147cddc64525

mediawiki: Add initial parsoid support for visualeditor
---

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 2fcc6fa78..d086ab85b 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -110,6 +110,12 @@ apt_source "postgresql" do
   key "ACCC4CF8"
 end
 
+apt_source "mediawiki" do
+  template "mediawiki.list.erb"
+  url "https://releases.wikimedia.org/debian"
+  key "664C383A3566A3481B942F007A322AC6E84AFDD2"
+end
+
 package "unattended-upgrades"
 
 auto_upgrades = if node[:apt][:unattended_upgrades][:enable]
diff --git a/cookbooks/apt/templates/default/mediawiki.list.erb b/cookbooks/apt/templates/default/mediawiki.list.erb
new file mode 100644
index 000000000..3d0062ad9
--- /dev/null
+++ b/cookbooks/apt/templates/default/mediawiki.list.erb
@@ -0,0 +1,4 @@
+# DO NOT EDIT - This file is being maintained by Chef
+
+deb <%= @url %> jessie-mediawiki main
+deb-src <%= @url %> jessie-mediawiki main
diff --git a/cookbooks/mediawiki/attributes/default.rb b/cookbooks/mediawiki/attributes/default.rb
index 7fce6d785..59838f920 100644
--- a/cookbooks/mediawiki/attributes/default.rb
+++ b/cookbooks/mediawiki/attributes/default.rb
@@ -1,3 +1,6 @@
+# Add the mediawiki APT source
+default[:apt][:sources] = node[:apt][:sources] | ["mediawiki"]
+
 # Default to enabling the "wiki" role
 default[:accounts][:users][:wiki][:status] = :role
 
diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 267c4f4b1..cadefe60c 100644
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -45,6 +45,10 @@ package "poppler-utils"
 # Mediawiki backup
 package "xz-utils"
 
+# Mediawiki packages for VisualEditor support
+package "curl"
+package "parsoid"
+
 link "/etc/php5/apache2/conf.d/20-wikidiff2.ini" do
   to "../../mods-available/wikidiff2.ini"
 end