X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/663750c10bc7ac3d422b08055485be7819671086..680ff1ff298a48b923644ea32b3dea392fca299a:/cookbooks/mediawiki/providers/site.rb

diff --git a/cookbooks/mediawiki/providers/site.rb b/cookbooks/mediawiki/providers/site.rb
index c17f871ca..24667e37d 100644
--- a/cookbooks/mediawiki/providers/site.rb
+++ b/cookbooks/mediawiki/providers/site.rb
@@ -28,12 +28,12 @@ end
 use_inline_resources
 
 action :create do
-  node.set_unless[:mediawiki][:sites][new_resource.name] = {}
+  node.normal_unless[:mediawiki][:sites][new_resource.name] = {}
 
-  node.set[:mediawiki][:sites][new_resource.name][:directory] = site_directory
-  node.set[:mediawiki][:sites][new_resource.name][:version] = new_resource.version
+  node.normal[:mediawiki][:sites][new_resource.name][:directory] = site_directory
+  node.normal[:mediawiki][:sites][new_resource.name][:version] = new_resource.version
 
-  node.set_unless[:mediawiki][:sites][new_resource.name][:wgSecretKey] = SecureRandom.base64(48)
+  node.normal_unless[:mediawiki][:sites][new_resource.name][:wgSecretKey] = SecureRandom.base64(48)
 
   mysql_user "#{new_resource.database_user}@localhost" do
     password new_resource.database_password
@@ -76,23 +76,32 @@ action :create do
   directory site_directory do
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
-    mode 0775
+    mode 0o775
   end
 
   directory mediawiki_directory do
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
-    mode 0775
+    mode 0o775
   end
 
   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
@@ -112,19 +121,19 @@ action :create do
   directory "#{mediawiki_directory}/images" do
     owner "www-data"
     group node[:mediawiki][:group]
-    mode 0775
+    mode 0o775
   end
 
   directory "#{mediawiki_directory}/cache" do
     owner "www-data"
     group node[:mediawiki][:group]
-    mode 0775
+    mode 0o775
   end
 
   directory "#{mediawiki_directory}/LocalSettings.d" do
     user node[:mediawiki][:user]
     group node[:mediawiki][:group]
-    mode 0775
+    mode 0o775
   end
 
   template "#{mediawiki_directory}/LocalSettings.php" do
@@ -132,7 +141,7 @@ action :create do
     source "LocalSettings.php.erb"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
-    mode 0664
+    mode 0o664
     variables :name => new_resource.name,
               :directory => mediawiki_directory,
               :database_params => new_resource.database_params,
@@ -145,7 +154,7 @@ action :create do
     source "mediawiki.cron.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :name => new_resource.name, :directory => site_directory,
               :user => node[:mediawiki][:user]
   end
@@ -155,7 +164,7 @@ action :create do
     source "mediawiki-backup.cron.erb"
     owner "root"
     group "root"
-    mode 0700
+    mode 0o700
     variables :name => new_resource.name, :directory => site_directory,
               :database_params => new_resource.database_params
   end
@@ -182,18 +191,30 @@ action :create do
 
   mediawiki_extension "Cite" do
     site new_resource.name
-    template "mw-ext-Cite.inc.php.erb"
     update_site false
   end
 
-  mediawiki_extension "ConfirmEdit" do
+  mediawiki_extension "CiteThisPage" do
     site new_resource.name
-    template "mw-ext-ConfirmEdit.inc.php.erb"
-    variables :public_key => new_resource.recaptcha_public_key,
-              :private_key => new_resource.recaptcha_private_key
     update_site false
   end
 
+  if new_resource.private_accounts || new_resource.private
+    mediawiki_extension "ConfirmEdit" do
+      site new_resource.name
+      update_site false
+      action :delete
+    end
+  else
+    mediawiki_extension "ConfirmEdit" do
+      site new_resource.name
+      template "mw-ext-ConfirmEdit.inc.php.erb"
+      variables :public_key => new_resource.recaptcha_public_key,
+                :private_key => new_resource.recaptcha_private_key
+      update_site false
+    end
+  end
+
   mediawiki_extension "Gadgets" do
     site new_resource.name
     update_site false
@@ -244,6 +265,7 @@ action :create do
   mediawiki_extension "SimpleAntiSpam" do
     site new_resource.name
     update_site false
+    action :delete
   end
 
   mediawiki_extension "SpamBlacklist" do
@@ -254,6 +276,7 @@ action :create do
 
   mediawiki_extension "SyntaxHighlight_GeSHi" do
     site new_resource.name
+    template "mw-ext-SyntaxHighlight.inc.php.erb"
     update_site false
   end
 
@@ -270,17 +293,19 @@ action :create do
 
   # MediaWiki Language Extension Bundle
   # FIXME: should automatically resolve tag
-  mw_lang_ext_bundle_tag = "2015.03"
+  mw_lang_ext_bundle_tag = "2017.01"
 
   mediawiki_extension "Babel" do
     site new_resource.name
     template "mw-ext-Babel.inc.php.erb"
+    # tag mw_lang_ext_bundle_tag
     tag mw_lang_ext_bundle_tag
     update_site false
   end
 
   mediawiki_extension "cldr" do
     site new_resource.name
+    template "mw-ext-cldr.inc.php.erb"
     tag mw_lang_ext_bundle_tag
     update_site false
   end
@@ -324,6 +349,7 @@ action :create do
 
   mediawiki_extension "AntiSpoof" do
     site new_resource.name
+    template "mw-ext-AntiSpoof.inc.php.erb"
     update_site false
   end
 
@@ -357,6 +383,7 @@ action :create do
 
   mediawiki_extension "osmtaginfo" do
     site new_resource.name
+    template "mw-ext-osmtaginfo.inc.php.erb"
     repository "git://github.com/Firefishy/osmtaginfo.git"
     tag "live"
     update_site false
@@ -364,6 +391,7 @@ action :create do
 
   mediawiki_extension "SimpleMap" do
     site new_resource.name
+    template "mw-ext-SimpleMap.inc.php.erb"
     repository "git://github.com/Firefishy/SimpleMap.git"
     tag "live"
     update_site false
@@ -371,16 +399,41 @@ action :create do
 
   mediawiki_extension "SlippyMap" do
     site new_resource.name
+    template "mw-ext-SlippyMap.inc.php.erb"
     repository "git://github.com/Firefishy/SlippyMap.git"
     tag "live"
     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
+
+  mediawiki_extension "VisualEditor" do
+    site new_resource.name
+    template "mw-ext-VisualEditor.inc.php.erb"
+    update_site false
+  end
+
   cookbook_file "#{site_directory}/cc-wiki.png" do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
-    mode 0644
+    mode 0o644
     backup false
   end
 
@@ -388,7 +441,7 @@ action :create do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
-    mode 0644
+    mode 0o644
     backup false
   end
 
@@ -396,21 +449,25 @@ action :create do
     cookbook "mediawiki"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
-    mode 0644
+    mode 0o644
     backup false
   end
 
   ports = new_resource.ssl_enabled ? [80, 443] : [80]
 
+  ssl_certificate new_resource.name do
+    domains [new_resource.name] + Array(new_resource.aliases)
+    only_if { new_resource.ssl_enabled }
+  end
+
   apache_site new_resource.name do
     cookbook "mediawiki"
     template "apache.erb"
     directory site_directory
     variables :aliases => Array(new_resource.aliases),
               :private => new_resource.private,
-              :ports => ports,
-              :ssl_certificate => new_resource.ssl_certificate,
-              :ssl_certificate_chain => new_resource.ssl_certificate_chain
+              :ssl_enabled => new_resource.ssl_enabled,
+              :ports => ports
     reload_apache false
   end
 
@@ -432,7 +489,7 @@ action :update do
     source "LocalSettings.php.erb"
     owner node[:mediawiki][:user]
     group node[:mediawiki][:group]
-    mode 0664
+    mode 0o664
     variables :name => new_resource.name,
               :directory => mediawiki_directory,
               :database_params => new_resource.database_params,