X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/cf651d722891278b6a1c778377d786525473bde1..6c52b23cf7a466ae14b8425da052318b85f2367f:/cookbooks/mediawiki/providers/site.rb

diff --git a/cookbooks/mediawiki/providers/site.rb b/cookbooks/mediawiki/providers/site.rb
index 9ee706513..f93306f56 100644
--- a/cookbooks/mediawiki/providers/site.rb
+++ b/cookbooks/mediawiki/providers/site.rb
@@ -87,12 +87,21 @@ action :create do
 
   mediawiki_reference = "REL#{new_resource.version}".tr(".", "_")
 
+  git "#{mediawiki_directory}/vendor" do
+    action :nothing
+    repository "https://gerrit.wikimedia.org/r/p/mediawiki/vendor.git"
+    revision mediawiki_reference
+    user node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+  end
+
   git mediawiki_directory do
     action :sync
     repository "https://gerrit.wikimedia.org/r/p/mediawiki/core.git"
     revision mediawiki_reference
     user node[:mediawiki][:user]
     group node[:mediawiki][:group]
+    notifies :sync, "git[#{mediawiki_directory}/vendor]", :immediately
     notifies :run, "execute[#{mediawiki_directory}/maintenance/install.php]", :immediately
     notifies :run, "execute[#{mediawiki_directory}/maintenance/update.php]"
   end
@@ -182,7 +191,11 @@ action :create do
 
   mediawiki_extension "Cite" do
     site new_resource.name
-    template "mw-ext-Cite.inc.php.erb"
+    update_site false
+  end
+
+  mediawiki_extension "CiteThisPage" do
+    site new_resource.name
     update_site false
   end
 
@@ -244,6 +257,7 @@ action :create do
   mediawiki_extension "SimpleAntiSpam" do
     site new_resource.name
     update_site false
+    action :delete
   end
 
   mediawiki_extension "SpamBlacklist" do
@@ -270,7 +284,7 @@ action :create do
 
   # MediaWiki Language Extension Bundle
   # FIXME: should automatically resolve tag
-  mw_lang_ext_bundle_tag = "2015.08"
+  mw_lang_ext_bundle_tag = "2015.10"
 
   mediawiki_extension "Babel" do
     site new_resource.name
@@ -360,6 +374,7 @@ action :create do
     repository "git://github.com/Firefishy/osmtaginfo.git"
     tag "live"
     update_site false
+    action :delete
   end
 
   mediawiki_extension "SimpleMap" do
@@ -367,6 +382,7 @@ action :create do
     repository "git://github.com/Firefishy/SimpleMap.git"
     tag "live"
     update_site false
+    action :delete
   end
 
   mediawiki_extension "SlippyMap" do
@@ -374,11 +390,13 @@ action :create do
     repository "git://github.com/Firefishy/SlippyMap.git"
     tag "live"
     update_site false
+    action :delete
   end
 
   mediawiki_extension "Mantle" do
     site new_resource.name
     update_site false
+    action :delete
   end
 
   mediawiki_extension "MobileFrontend" do
@@ -387,6 +405,12 @@ action :create do
     update_site false
   end
 
+  mediawiki_extension "DisableAccount" do
+    site new_resource.name
+    template "mw-ext-DisableAccount.inc.php.erb"
+    update_site false
+  end
+
   cookbook_file "#{site_directory}/cc-wiki.png" do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]