mediawiki: additional anti-spam regex

[chef.git] / cookbooks / mediawiki / providers / site.rb

diff --git a/cookbooks/mediawiki/providers/site.rb b/cookbooks/mediawiki/providers/site.rb
index 1548da5c1fc480cc12e7096bd157328f23ef8ec5..0a72b203d232b1b4b9af18794991de09ef9a959b 100644 (file)
--- a/cookbooks/mediawiki/providers/site.rb
+++ b/cookbooks/mediawiki/providers/site.rb
@@ -89,7 +89,7 @@ action :create do
 
   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]
@@ -270,7 +270,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.08"
 
   mediawiki_extension "Babel" do
     site new_resource.name
@@ -376,6 +376,23 @@ action :create do
     update_site false
   end
 
+  mediawiki_extension "Mantle" do
+    site new_resource.name
+    update_site false
+  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]
@@ -400,13 +417,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