X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/224058ab9583abbd0fb71eec94bab55e7f0b093a..d0a6dd09b9cd9d1c493c15adfd25b880f505e9af:/cookbooks/mediawiki/providers/site.rb

diff --git a/cookbooks/mediawiki/providers/site.rb b/cookbooks/mediawiki/providers/site.rb
index c5b6927a6..ad8454622 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 "git://github.com/wikimedia/mediawiki"
+    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
@@ -160,9 +169,33 @@ action :create do
               :database_params => new_resource.database_params
   end
 
+  mediawiki_skin "CologneBlue" do # ~FC005
+    site new_resource.name
+    update_site false
+  end
+
+  mediawiki_skin "Modern" do
+    site new_resource.name
+    update_site false
+  end
+
+  mediawiki_skin "MonoBook" do
+    site new_resource.name
+    update_site false
+  end
+
+  mediawiki_skin "Vector" do
+    site new_resource.name
+    update_site false
+  end
+
   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
 
@@ -224,6 +257,7 @@ action :create do
   mediawiki_extension "SimpleAntiSpam" do
     site new_resource.name
     update_site false
+    action :delete
   end
 
   mediawiki_extension "SpamBlacklist" do
@@ -250,7 +284,7 @@ action :create do
 
   # MediaWiki Language Extension Bundle
   # FIXME: should automatically resolve tag
-  mw_lang_ext_bundle_tag = "2015.03"
+  mw_lang_ext_bundle_tag = "2015.10"
 
   mediawiki_extension "Babel" do
     site new_resource.name
@@ -356,6 +390,24 @@ action :create do
     update_site false
   end
 
+  mediawiki_extension "Mantle" do
+    site new_resource.name
+    update_site false
+    action :delete
+  end
+
+  mediawiki_extension "MobileFrontend" do
+    site new_resource.name
+    template "mw-ext-MobileFrontend.inc.php.erb"
+    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]
@@ -380,13 +432,15 @@ action :create do
     backup false
   end
 
+  ports = new_resource.ssl_enabled ? [80, 443] : [80]
+
   apache_site new_resource.name do
     cookbook "mediawiki"
     template "apache.erb"
     directory site_directory
     variables :aliases => Array(new_resource.aliases),
               :private => new_resource.private,
-              :ssl_enabled => new_resource.ssl_enabled,
+              :ports => ports,
               :ssl_certificate => new_resource.ssl_certificate,
               :ssl_certificate_chain => new_resource.ssl_certificate_chain
     reload_apache false
@@ -402,6 +456,31 @@ action :create do
   end
 end
 
+action :update do
+  mediawiki_directory = "#{site_directory}/w"
+
+  template "#{mediawiki_directory}/LocalSettings.php" do
+    cookbook "mediawiki"
+    source "LocalSettings.php.erb"
+    owner node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+    mode 0664
+    variables :name => new_resource.name,
+              :directory => mediawiki_directory,
+              :database_params => new_resource.database_params,
+              :mediawiki => new_resource.mediawiki_params
+    notifies :run, "execute[#{mediawiki_directory}/maintenance/update.php]"
+  end
+
+  execute "#{mediawiki_directory}/maintenance/update.php" do
+    action :run
+    command "php maintenance/update.php --quick"
+    cwd mediawiki_directory
+    user node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+  end
+end
+
 action :delete do
   apache_site new_resource.name do
     action :delete