From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 Nov 2017 18:00:42 +0000 (+0000)
Subject: Modernise mediawiki LWRPs
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/316225f5a6da64609cef4d090047b92bffef49a6?ds=sidebyside

Modernise mediawiki LWRPs
---

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f651adfb9..02bdf6701 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -13,7 +13,7 @@ Metrics/AbcSize:
 # Offense count: 27
 # Configuration parameters: CountComments.
 Metrics/BlockLength:
-  Max: 360
+  Max: 361
 
 # Offense count: 3
 Metrics/CyclomaticComplexity:
diff --git a/cookbooks/mediawiki/providers/extension.rb b/cookbooks/mediawiki/providers/extension.rb
deleted file mode 100644
index f32f581b4..000000000
--- a/cookbooks/mediawiki/providers/extension.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-# Cookbook Name:: mediawiki
-# Provider:: mediawiki_extension
-#
-# Copyright 2015, OpenStreetMap Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-def whyrun_supported?
-  true
-end
-
-use_inline_resources
-
-action :create do
-  if new_resource.source
-    remote_directory extension_directory do
-      cookbook "mediawiki"
-      source new_resource.source
-      owner node[:mediawiki][:user]
-      group node[:mediawiki][:group]
-      mode 0o755
-      files_owner node[:mediawiki][:user]
-      files_group node[:mediawiki][:group]
-      files_mode 0o755
-    end
-  else
-    extension_repository = new_resource.repository || default_repository
-    extension_reference = if new_resource.reference
-                            new_resource.reference
-                          elsif new_resource.tag
-                            "refs/tags/#{new_resource.tag}"
-                          else
-                            "REL#{extension_version}".tr(".", "_")
-                          end
-
-    git extension_directory do
-      action :sync
-      repository extension_repository
-      reference extension_reference
-      enable_submodules true
-      user node[:mediawiki][:user]
-      group node[:mediawiki][:group]
-      ignore_failure extension_repository.start_with?("git://github.com/wikimedia/mediawiki-extensions")
-    end
-  end
-
-  if new_resource.template # ~FC023
-    template "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.name}.inc.php" do
-      cookbook "mediawiki"
-      source new_resource.template
-      user node[:mediawiki][:user]
-      group node[:mediawiki][:group]
-      mode 0o664
-      variables new_resource.variables
-    end
-  else
-    extension_script = "#{extension_directory}/#{new_resource.name}.php"
-
-    file "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.name}.inc.php" do
-      content "<?php wfLoadExtension( '#{new_resource.name}' );\n"
-      user node[:mediawiki][:user]
-      group node[:mediawiki][:group]
-      mode 0o664
-      only_if { ::File.exist?(extension_script) }
-    end
-  end
-end
-
-action :delete do
-  directory extension_directory do
-    action :delete
-    recursive true
-  end
-
-  file "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.name}.inc.php" do
-    action :delete
-  end
-end
-
-private
-
-def site_directory
-  node[:mediawiki][:sites][new_resource.site][:directory]
-end
-
-def mediawiki_directory
-  "#{site_directory}/w"
-end
-
-def extension_directory
-  "#{mediawiki_directory}/extensions/#{new_resource.name}"
-end
-
-def extension_version
-  new_resource.version || node[:mediawiki][:sites][new_resource.site][:version]
-end
-
-def default_repository
-  "git://github.com/wikimedia/mediawiki-extensions-#{new_resource.name}.git"
-end
diff --git a/cookbooks/mediawiki/providers/site.rb b/cookbooks/mediawiki/providers/site.rb
deleted file mode 100644
index f637271ca..000000000
--- a/cookbooks/mediawiki/providers/site.rb
+++ /dev/null
@@ -1,535 +0,0 @@
-#
-# Cookbook Name:: mediawiki
-# Provider:: mediawiki_site
-#
-# Copyright 2015, OpenStreetMap Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "securerandom"
-
-include Chef::Mixin::EditFile
-
-def whyrun_supported?
-  true
-end
-
-use_inline_resources
-
-action :create do
-  node.normal_unless[:mediawiki][:sites][new_resource.name] = {}
-
-  node.normal[:mediawiki][:sites][new_resource.name][:directory] = site_directory
-  node.normal[:mediawiki][:sites][new_resource.name][:version] = new_resource.version
-
-  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
-  end
-
-  mysql_database new_resource.database_name do
-    permissions "#{new_resource.database_user}@localhost" => :all
-  end
-
-  mediawiki_directory = "#{site_directory}/w"
-
-  ruby_block "rename-installer-localsettings" do
-    action :nothing
-    block do
-      ::File.rename("#{mediawiki_directory}/LocalSettings.php", "#{mediawiki_directory}/LocalSettings-install.php")
-    end
-  end
-
-  execute "#{mediawiki_directory}/maintenance/install.php" do
-    action :nothing
-    # Use metanamespace as Site Name to ensure correct set namespace
-    command "php maintenance/install.php --server '#{name}' --dbtype 'mysql' --dbname '#{new_resource.database_name}' --dbuser '#{new_resource.database_user}' --dbpass '#{new_resource.database_password}' --dbserver 'localhost' --scriptpath /w --pass '#{new_resource.admin_password}' '#{new_resource.metanamespace}' '#{new_resource.admin_user}'"
-    cwd mediawiki_directory
-    user node[:mediawiki][:user]
-    group node[:mediawiki][:group]
-    not_if do
-      ::File.exist?("#{mediawiki_directory}/LocalSettings-install.php")
-    end
-    notifies :run, "ruby_block[rename-installer-localsettings]", :immediately
-  end
-
-  execute "#{mediawiki_directory}/maintenance/update.php" do
-    action :nothing
-    command "php maintenance/update.php --quick"
-    cwd mediawiki_directory
-    user node[:mediawiki][:user]
-    group node[:mediawiki][:group]
-  end
-
-  directory site_directory do
-    owner node[:mediawiki][:user]
-    group node[:mediawiki][:group]
-    mode 0o775
-  end
-
-  directory mediawiki_directory do
-    owner node[:mediawiki][:user]
-    group node[:mediawiki][:group]
-    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 "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
-
-  # Safety catch if git doesn't update but install.php hasn't run
-  ruby_block "catch-installer-localsettings-run" do
-    action :run
-    block do
-      #
-    end
-    not_if do
-      ::File.exist?("#{mediawiki_directory}/LocalSettings-install.php")
-    end
-    notifies :run, "execute[#{mediawiki_directory}/maintenance/install.php]", :immediately
-  end
-
-  directory "#{mediawiki_directory}/images" do
-    owner "www-data"
-    group node[:mediawiki][:group]
-    mode 0o775
-  end
-
-  directory "#{mediawiki_directory}/cache" do
-    owner "www-data"
-    group node[:mediawiki][:group]
-    mode 0o775
-  end
-
-  directory "#{mediawiki_directory}/LocalSettings.d" do
-    user node[:mediawiki][:user]
-    group node[:mediawiki][:group]
-    mode 0o775
-  end
-
-  template "#{mediawiki_directory}/LocalSettings.php" do
-    cookbook "mediawiki"
-    source "LocalSettings.php.erb"
-    owner node[:mediawiki][:user]
-    group node[:mediawiki][:group]
-    mode 0o664
-    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
-
-  template "/etc/cron.d/mediawiki-#{cron_name}" do
-    cookbook "mediawiki"
-    source "mediawiki.cron.erb"
-    owner "root"
-    group "root"
-    mode 0o644
-    variables :name => new_resource.name, :directory => site_directory,
-              :user => node[:mediawiki][:user]
-  end
-
-  template "/etc/cron.daily/mediawiki-#{cron_name}-backup" do
-    cookbook "mediawiki"
-    source "mediawiki-backup.cron.erb"
-    owner "root"
-    group "root"
-    mode 0o700
-    variables :name => new_resource.name, :directory => site_directory,
-              :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
-    update_site false
-  end
-
-  mediawiki_extension "CiteThisPage" do
-    site new_resource.name
-    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
-  end
-
-  mediawiki_extension "ImageMap" do
-    site new_resource.name
-    update_site false
-  end
-
-  mediawiki_extension "InputBox" do
-    site new_resource.name
-    update_site false
-  end
-
-  mediawiki_extension "Interwiki" do
-    site new_resource.name
-    update_site false
-  end
-
-  mediawiki_extension "Nuke" do
-    site new_resource.name
-    update_site false
-  end
-
-  mediawiki_extension "ParserFunctions" do
-    site new_resource.name
-    template "mw-ext-ParserFunctions.inc.php.erb"
-    update_site false
-  end
-
-  mediawiki_extension "PdfHandler" do
-    site new_resource.name
-    template "mw-ext-PdfHandler.inc.php.erb"
-    update_site false
-  end
-
-  mediawiki_extension "Poem" do
-    site new_resource.name
-    update_site false
-  end
-
-  mediawiki_extension "Renameuser" do
-    site new_resource.name
-    update_site false
-  end
-
-  mediawiki_extension "SimpleAntiSpam" do
-    site new_resource.name
-    update_site false
-    action :delete
-  end
-
-  mediawiki_extension "SpamBlacklist" do
-    site new_resource.name
-    template "mw-ext-SpamBlacklist.inc.php.erb"
-    update_site false
-  end
-
-  mediawiki_extension "SyntaxHighlight_GeSHi" do
-    site new_resource.name
-    template "mw-ext-SyntaxHighlight.inc.php.erb"
-    update_site false
-  end
-
-  mediawiki_extension "TitleBlacklist" do
-    site new_resource.name
-    template "mw-ext-TitleBlacklist.inc.php.erb"
-    update_site false
-  end
-
-  mediawiki_extension "WikiEditor" do
-    site new_resource.name
-    update_site false
-  end
-
-  # MediaWiki Language Extension Bundle
-  # FIXME: should automatically resolve tag
-  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
-
-  mediawiki_extension "CleanChanges" do
-    site new_resource.name
-    template "mw-ext-CleanChanges.inc.php.erb"
-    tag mw_lang_ext_bundle_tag
-    update_site false
-  end
-
-  mediawiki_extension "LocalisationUpdate" do
-    site new_resource.name
-    template "mw-ext-LocalisationUpdate.inc.php.erb"
-    tag mw_lang_ext_bundle_tag
-    update_site false
-  end
-
-  # LocalisationUpdate Update Cron
-  # template "/etc/cron.d/mediawiki-#{name}-LocalisationUpdate" do
-  #   cookbook "mediawiki"
-  #   source "mediawiki-LocalisationUpdate.cron.erb"
-  #   owner "root"
-  #   group "root"
-  #   mode 0755
-  #   variables :name => name, :directory => site_directory, :user => node[:mediawiki][:user]
-  # end
-
-  # mediawiki_extension "Translate" do
-  #   site new_resource.name
-  #   template "mw-ext-Translate.inc.php.erb"
-  #   tag mw_lang_ext_bundle_tag
-  #   update_site false
-  # end
-
-  mediawiki_extension "UniversalLanguageSelector" do
-    site new_resource.name
-    tag mw_lang_ext_bundle_tag
-    update_site false
-  end
-
-  mediawiki_extension "AntiSpoof" do
-    site new_resource.name
-    template "mw-ext-AntiSpoof.inc.php.erb"
-    update_site false
-  end
-
-  mediawiki_extension "AbuseFilter" do
-    site new_resource.name
-    template "mw-ext-AbuseFilter.inc.php.erb"
-    update_site false
-  end
-
-  mediawiki_extension "CheckUser" do
-    site new_resource.name
-    template "mw-ext-CheckUser.inc.php.erb"
-    update_site false
-  end
-
-  mediawiki_extension "DismissableSiteNotice" do
-    site new_resource.name
-    update_site false
-  end
-
-  mediawiki_extension "Elastica" do
-    site new_resource.name
-    update_site false
-  end
-
-  mediawiki_extension "CirrusSearch" do
-    site new_resource.name
-    template "mw-ext-CirrusSearch.inc.php.erb"
-    update_site false
-  end
-
-  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
-  end
-
-  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
-  end
-
-  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 0o644
-    backup false
-  end
-
-  cookbook_file "#{site_directory}/googled06a989d1ccc8364.html" do
-    cookbook "mediawiki"
-    owner node[:mediawiki][:user]
-    group node[:mediawiki][:group]
-    mode 0o644
-    backup false
-  end
-
-  cookbook_file "#{site_directory}/googlefac54c35e800caab.html" do
-    cookbook "mediawiki"
-    owner node[:mediawiki][:user]
-    group node[:mediawiki][:group]
-    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,
-              :ssl_enabled => new_resource.ssl_enabled,
-              :ports => ports
-    reload_apache false
-  end
-
-  # FIXME: needs to run one
-  execute "#{mediawiki_directory}/extensions/CirrusSearch/maintenance/updateSearchIndexConfig.php" do
-    action :nothing
-    command "php extensions/CirrusSearch/maintenance/updateSearchIndexConfig.php"
-    cwd mediawiki_directory
-    user node[:mediawiki][:user]
-    group node[:mediawiki][:group]
-  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 0o664
-    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
-    reload_apache false
-  end
-
-  directory site_directory do
-    action :delete
-    recursive true
-  end
-
-  mysql_database new_resource.database_name do
-    action :drop
-  end
-
-  mysql_user "#{new_resource.database_user}@localhost" do
-    action :drop
-  end
-end
-
-def site_directory
-  new_resource.directory || "/srv/#{new_resource.name}"
-end
-
-def cron_name
-  new_resource.name.tr(".", "_")
-end
diff --git a/cookbooks/mediawiki/providers/skin.rb b/cookbooks/mediawiki/providers/skin.rb
deleted file mode 100644
index 59bd21b3e..000000000
--- a/cookbooks/mediawiki/providers/skin.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# Cookbook Name:: mediawiki
-# Provider:: mediawiki_skin
-#
-# Copyright 2015, OpenStreetMap Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-def whyrun_supported?
-  true
-end
-
-use_inline_resources
-
-action :create do
-  if new_resource.source
-    remote_directory skin_directory do
-      cookbook "mediawiki"
-      source new_resource.source
-      owner node[:mediawiki][:user]
-      group node[:mediawiki][:group]
-      mode 0o755
-      files_owner node[:mediawiki][:user]
-      files_group node[:mediawiki][:group]
-      files_mode 0o755
-    end
-  else
-    skin_repository = new_resource.repository || default_repository
-    skin_revision = new_resource.revision || "REL#{skin_version}".tr(".", "_")
-
-    git skin_directory do
-      action :sync
-      repository skin_repository
-      revision skin_revision
-      enable_submodules true
-      user node[:mediawiki][:user]
-      group node[:mediawiki][:group]
-      ignore_failure skin_repository.start_with?("git://github.com/wikimedia/mediawiki-skins")
-    end
-  end
-
-  if new_resource.template # ~FC023
-    template "#{mediawiki_directory}/LocalSettings.d/Skin-#{new_resource.name}.inc.php" do
-      cookbook "mediawiki"
-      source new_resource.template
-      user node[:mediawiki][:user]
-      group node[:mediawiki][:group]
-      mode 0o664
-      variables new_resource.variables
-    end
-  else
-    skin_script = "#{skin_directory}/#{new_resource.name}.php"
-
-    file "#{mediawiki_directory}/LocalSettings.d/Skin-#{new_resource.name}.inc.php" do
-      content "<?php require_once('#{skin_script}');\n"
-      user node[:mediawiki][:user]
-      group node[:mediawiki][:group]
-      mode 0o664
-      only_if { ::File.exist?(skin_script) }
-    end
-  end
-end
-
-action :delete do
-  directory skin_directory do
-    action :delete
-    recursive true
-  end
-
-  file "#{mediawiki_directory}/LocalSettings.d/Skin-#{new_resource.name}.inc.php" do
-    action :delete
-  end
-end
-
-private
-
-def site_directory
-  node[:mediawiki][:sites][new_resource.site][:directory]
-end
-
-def mediawiki_directory
-  "#{site_directory}/w"
-end
-
-def skin_directory
-  "#{mediawiki_directory}/skins/#{new_resource.name}"
-end
-
-def skin_version
-  new_resource.version || node[:mediawiki][:sites][new_resource.site][:version]
-end
-
-def default_repository
-  "git://github.com/wikimedia/mediawiki-skins-#{new_resource.name}.git"
-end
diff --git a/cookbooks/mediawiki/resources/extension.rb b/cookbooks/mediawiki/resources/extension.rb
index c567ee507..e7b3bc046 100644
--- a/cookbooks/mediawiki/resources/extension.rb
+++ b/cookbooks/mediawiki/resources/extension.rb
@@ -17,19 +17,106 @@
 # limitations under the License.
 #
 
-actions :create, :delete
 default_action :create
 
-attribute :name, :kind_of => String, :name_attribute => true
-attribute :site, :kind_of => String, :required => true
-attribute :source, :kind_of => String
-attribute :template, :kind_of => String
-attribute :variables, :kind_of => Hash, :default => {}
-attribute :version, :kind_of => String
-attribute :repository, :kind_of => String
-attribute :tag, :kind_of => String
-attribute :reference, :kind_of => String
-attribute :update_site, :kind_of => [TrueClass, FalseClass], :default => true
+property :extension, :kind_of => String, :name_attribute => true
+property :site, :kind_of => String, :required => true
+property :source, :kind_of => String
+property :template, :kind_of => String
+property :variables, :kind_of => Hash, :default => {}
+property :version, :kind_of => String
+property :repository, :kind_of => String
+property :tag, :kind_of => String
+property :reference, :kind_of => String
+property :update_site, :kind_of => [TrueClass, FalseClass], :default => true
+
+action :create do
+  if new_resource.source
+    remote_directory extension_directory do
+      cookbook "mediawiki"
+      source new_resource.source
+      owner node[:mediawiki][:user]
+      group node[:mediawiki][:group]
+      mode 0o755
+      files_owner node[:mediawiki][:user]
+      files_group node[:mediawiki][:group]
+      files_mode 0o755
+    end
+  else
+    extension_repository = new_resource.repository || default_repository
+    extension_reference = if new_resource.reference
+                            new_resource.reference
+                          elsif new_resource.tag
+                            "refs/tags/#{new_resource.tag}"
+                          else
+                            "REL#{extension_version}".tr(".", "_")
+                          end
+
+    git extension_directory do
+      action :sync
+      repository extension_repository
+      reference extension_reference
+      enable_submodules true
+      user node[:mediawiki][:user]
+      group node[:mediawiki][:group]
+      ignore_failure extension_repository.start_with?("git://github.com/wikimedia/mediawiki-extensions")
+    end
+  end
+
+  if new_resource.template # ~FC023
+    declare_resource :template, "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.extension}.inc.php" do
+      cookbook "mediawiki"
+      source new_resource.template
+      user node[:mediawiki][:user]
+      group node[:mediawiki][:group]
+      mode 0o664
+      variables new_resource.variables
+    end
+  else
+    extension_script = "#{extension_directory}/#{new_resource.extension}.php"
+
+    file "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.extension}.inc.php" do
+      content "<?php wfLoadExtension( '#{new_resource.extension}' );\n"
+      user node[:mediawiki][:user]
+      group node[:mediawiki][:group]
+      mode 0o664
+      only_if { ::File.exist?(extension_script) }
+    end
+  end
+end
+
+action :delete do
+  directory extension_directory do
+    action :delete
+    recursive true
+  end
+
+  file "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.extension}.inc.php" do
+    action :delete
+  end
+end
+
+action_class do
+  def site_directory
+    node[:mediawiki][:sites][new_resource.site][:directory]
+  end
+
+  def mediawiki_directory
+    "#{site_directory}/w"
+  end
+
+  def extension_directory
+    "#{mediawiki_directory}/extensions/#{new_resource.extension}"
+  end
+
+  def extension_version
+    new_resource.version || node[:mediawiki][:sites][new_resource.site][:version]
+  end
+
+  def default_repository
+    "git://github.com/wikimedia/mediawiki-extensions-#{new_resource.extension}.git"
+  end
+end
 
 def after_created
   if update_site
diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 3756137d2..0995c11fe 100644
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -17,64 +17,573 @@
 # limitations under the License.
 #
 
-actions :create, :update, :delete
 default_action :create
 
-attribute :name, :kind_of => String, :name_attribute => true
-attribute :aliases, :kind_of => [String, Array]
-attribute :directory, :kind_of => String
-attribute :version, :kind_of => String, :default => "1.28"
-attribute :database_name, :kind_of => String, :required => true
-attribute :database_user, :kind_of => String, :required => true
-attribute :database_password, :kind_of => String, :required => true
-attribute :sitename, :kind_of => String, :default => "OpenStreetMap Wiki"
-attribute :metanamespace, :kind_of => String, :default => "OpenStreetMap"
-attribute :logo, :kind_of => String, :default => "$wgStylePath/common/images/wiki.png"
-attribute :email_contact, :kind_of => String, :default => ""
-attribute :email_sender, :kind_of => String, :default => ""
-attribute :email_sender_name, :kind_of => String, :default => "MediaWiki Mail"
-attribute :commons, :kind_of => [TrueClass, FalseClass], :default => true
-attribute :skin, :kind_of => String, :default => "vector"
-attribute :site_notice, :kind_of => [String, TrueClass, FalseClass], :default => false
-attribute :site_readonly, :kind_of => [String, TrueClass, FalseClass], :default => false
-attribute :admin_user, :kind_of => String, :default => "Admin"
-attribute :admin_password, :kind_of => String, :required => true
-attribute :ssl_enabled, :kind_of => [TrueClass, FalseClass], :default => false
-attribute :private_accounts, :kind_of => [TrueClass, FalseClass], :default => false
-attribute :private, :kind_of => [TrueClass, FalseClass], :default => false
-attribute :recaptcha_public_key, :kind_of => String
-attribute :recaptcha_private_key, :kind_of => String
-attribute :extra_file_extensions, :kind_of => [String, Array], :default => []
-attribute :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
+property :site, :kind_of => String, :name_attribute => true
+property :aliases, :kind_of => [String, Array]
+property :directory, :kind_of => String
+property :version, :kind_of => String, :default => "1.28"
+property :database_name, :kind_of => String, :required => true
+property :database_user, :kind_of => String, :required => true
+property :database_password, :kind_of => String, :required => true
+property :sitename, :kind_of => String, :default => "OpenStreetMap Wiki"
+property :metanamespace, :kind_of => String, :default => "OpenStreetMap"
+property :logo, :kind_of => String, :default => "$wgStylePath/common/images/wiki.png"
+property :email_contact, :kind_of => String, :default => ""
+property :email_sender, :kind_of => String, :default => ""
+property :email_sender_name, :kind_of => String, :default => "MediaWiki Mail"
+property :commons, :kind_of => [TrueClass, FalseClass], :default => true
+property :skin, :kind_of => String, :default => "vector"
+property :site_notice, :kind_of => [String, TrueClass, FalseClass], :default => false
+property :site_readonly, :kind_of => [String, TrueClass, FalseClass], :default => false
+property :admin_user, :kind_of => String, :default => "Admin"
+property :admin_password, :kind_of => String, :required => true
+property :ssl_enabled, :kind_of => [TrueClass, FalseClass], :default => false
+property :private_accounts, :kind_of => [TrueClass, FalseClass], :default => false
+property :private, :kind_of => [TrueClass, FalseClass], :default => false
+property :recaptcha_public_key, :kind_of => String
+property :recaptcha_private_key, :kind_of => String
+property :extra_file_extensions, :kind_of => [String, Array], :default => []
+property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 
-def after_created
-  notifies :reload, "service[apache2]" if reload_apache
+action :create do
+  node.normal_unless[:mediawiki][:sites][new_resource.site] = {}
+
+  node.normal[:mediawiki][:sites][new_resource.site][:directory] = site_directory
+  node.normal[:mediawiki][:sites][new_resource.site][:version] = new_resource.version
+
+  node.normal_unless[:mediawiki][:sites][new_resource.site][:wgSecretKey] = SecureRandom.base64(48)
+
+  mysql_user "#{new_resource.database_user}@localhost" do
+    password new_resource.database_password
+  end
+
+  mysql_database new_resource.database_name do
+    permissions "#{new_resource.database_user}@localhost" => :all
+  end
+
+  mediawiki_directory = "#{site_directory}/w"
+
+  ruby_block "rename-installer-localsettings" do
+    action :nothing
+    block do
+      ::File.rename("#{mediawiki_directory}/LocalSettings.php", "#{mediawiki_directory}/LocalSettings-install.php")
+    end
+  end
+
+  execute "#{mediawiki_directory}/maintenance/install.php" do
+    action :nothing
+    # Use metanamespace as Site Name to ensure correct set namespace
+    command "php maintenance/install.php --server '#{name}' --dbtype 'mysql' --dbname '#{new_resource.database_name}' --dbuser '#{new_resource.database_user}' --dbpass '#{new_resource.database_password}' --dbserver 'localhost' --scriptpath /w --pass '#{new_resource.admin_password}' '#{new_resource.metanamespace}' '#{new_resource.admin_user}'"
+    cwd mediawiki_directory
+    user node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+    not_if do
+      ::File.exist?("#{mediawiki_directory}/LocalSettings-install.php")
+    end
+    notifies :run, "ruby_block[rename-installer-localsettings]", :immediately
+  end
+
+  execute "#{mediawiki_directory}/maintenance/update.php" do
+    action :nothing
+    command "php maintenance/update.php --quick"
+    cwd mediawiki_directory
+    user node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+  end
+
+  declare_resource :directory, site_directory do
+    owner node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+    mode 0o775
+  end
+
+  declare_resource :directory, mediawiki_directory do
+    owner node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+    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 "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
+
+  # Safety catch if git doesn't update but install.php hasn't run
+  ruby_block "catch-installer-localsettings-run" do
+    action :run
+    block do
+      #
+    end
+    not_if do
+      ::File.exist?("#{mediawiki_directory}/LocalSettings-install.php")
+    end
+    notifies :run, "execute[#{mediawiki_directory}/maintenance/install.php]", :immediately
+  end
+
+  declare_resource :directory, "#{mediawiki_directory}/images" do
+    owner "www-data"
+    group node[:mediawiki][:group]
+    mode 0o775
+  end
+
+  declare_resource :directory, "#{mediawiki_directory}/cache" do
+    owner "www-data"
+    group node[:mediawiki][:group]
+    mode 0o775
+  end
+
+  declare_resource :directory, "#{mediawiki_directory}/LocalSettings.d" do
+    user node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+    mode 0o775
+  end
+
+  template "#{mediawiki_directory}/LocalSettings.php" do
+    cookbook "mediawiki"
+    source "LocalSettings.php.erb"
+    owner node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+    mode 0o664
+    variables :name => new_resource.site,
+              :directory => mediawiki_directory,
+              :database_params => database_params,
+              :mediawiki => mediawiki_params
+    notifies :run, "execute[#{mediawiki_directory}/maintenance/update.php]"
+  end
+
+  template "/etc/cron.d/mediawiki-#{cron_name}" do
+    cookbook "mediawiki"
+    source "mediawiki.cron.erb"
+    owner "root"
+    group "root"
+    mode 0o644
+    variables :name => new_resource.site, :directory => site_directory,
+              :user => node[:mediawiki][:user]
+  end
+
+  template "/etc/cron.daily/mediawiki-#{cron_name}-backup" do
+    cookbook "mediawiki"
+    source "mediawiki-backup.cron.erb"
+    owner "root"
+    group "root"
+    mode 0o700
+    variables :name => new_resource.site,
+              :directory => site_directory,
+              :database_params => database_params
+  end
+
+  mediawiki_skin "CologneBlue" do # ~FC005
+    site new_resource.site
+    update_site false
+  end
+
+  mediawiki_skin "Modern" do
+    site new_resource.site
+    update_site false
+  end
+
+  mediawiki_skin "MonoBook" do
+    site new_resource.site
+    update_site false
+  end
+
+  mediawiki_skin "Vector" do
+    site new_resource.site
+    update_site false
+  end
+
+  mediawiki_extension "Cite" do
+    site new_resource.site
+    update_site false
+  end
+
+  mediawiki_extension "CiteThisPage" do
+    site new_resource.site
+    update_site false
+  end
+
+  if new_resource.private_accounts || new_resource.private
+    mediawiki_extension "ConfirmEdit" do
+      site new_resource.site
+      update_site false
+      action :delete
+    end
+  else
+    mediawiki_extension "ConfirmEdit" do
+      site new_resource.site
+      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.site
+    update_site false
+  end
+
+  mediawiki_extension "ImageMap" do
+    site new_resource.site
+    update_site false
+  end
+
+  mediawiki_extension "InputBox" do
+    site new_resource.site
+    update_site false
+  end
+
+  mediawiki_extension "Interwiki" do
+    site new_resource.site
+    update_site false
+  end
+
+  mediawiki_extension "Nuke" do
+    site new_resource.site
+    update_site false
+  end
+
+  mediawiki_extension "ParserFunctions" do
+    site new_resource.site
+    template "mw-ext-ParserFunctions.inc.php.erb"
+    update_site false
+  end
+
+  mediawiki_extension "PdfHandler" do
+    site new_resource.site
+    template "mw-ext-PdfHandler.inc.php.erb"
+    update_site false
+  end
+
+  mediawiki_extension "Poem" do
+    site new_resource.site
+    update_site false
+  end
+
+  mediawiki_extension "Renameuser" do
+    site new_resource.site
+    update_site false
+  end
+
+  mediawiki_extension "SimpleAntiSpam" do
+    site new_resource.site
+    update_site false
+    action :delete
+  end
+
+  mediawiki_extension "SpamBlacklist" do
+    site new_resource.site
+    template "mw-ext-SpamBlacklist.inc.php.erb"
+    update_site false
+  end
+
+  mediawiki_extension "SyntaxHighlight_GeSHi" do
+    site new_resource.site
+    template "mw-ext-SyntaxHighlight.inc.php.erb"
+    update_site false
+  end
+
+  mediawiki_extension "TitleBlacklist" do
+    site new_resource.site
+    template "mw-ext-TitleBlacklist.inc.php.erb"
+    update_site false
+  end
+
+  mediawiki_extension "WikiEditor" do
+    site new_resource.site
+    update_site false
+  end
+
+  # MediaWiki Language Extension Bundle
+  # FIXME: should automatically resolve tag
+  mw_lang_ext_bundle_tag = "2017.01"
+
+  mediawiki_extension "Babel" do
+    site new_resource.site
+    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.site
+    template "mw-ext-cldr.inc.php.erb"
+    tag mw_lang_ext_bundle_tag
+    update_site false
+  end
+
+  mediawiki_extension "CleanChanges" do
+    site new_resource.site
+    template "mw-ext-CleanChanges.inc.php.erb"
+    tag mw_lang_ext_bundle_tag
+    update_site false
+  end
+
+  mediawiki_extension "LocalisationUpdate" do
+    site new_resource.site
+    template "mw-ext-LocalisationUpdate.inc.php.erb"
+    tag mw_lang_ext_bundle_tag
+    update_site false
+  end
+
+  # LocalisationUpdate Update Cron
+  # template "/etc/cron.d/mediawiki-#{name}-LocalisationUpdate" do
+  #   cookbook "mediawiki"
+  #   source "mediawiki-LocalisationUpdate.cron.erb"
+  #   owner "root"
+  #   group "root"
+  #   mode 0755
+  #   variables :name => name, :directory => site_directory, :user => node[:mediawiki][:user]
+  # end
+
+  # mediawiki_extension "Translate" do
+  #   site new_resource.site
+  #   template "mw-ext-Translate.inc.php.erb"
+  #   tag mw_lang_ext_bundle_tag
+  #   update_site false
+  # end
+
+  mediawiki_extension "UniversalLanguageSelector" do
+    site new_resource.site
+    tag mw_lang_ext_bundle_tag
+    update_site false
+  end
+
+  mediawiki_extension "AntiSpoof" do
+    site new_resource.site
+    template "mw-ext-AntiSpoof.inc.php.erb"
+    update_site false
+  end
+
+  mediawiki_extension "AbuseFilter" do
+    site new_resource.site
+    template "mw-ext-AbuseFilter.inc.php.erb"
+    update_site false
+  end
+
+  mediawiki_extension "CheckUser" do
+    site new_resource.site
+    template "mw-ext-CheckUser.inc.php.erb"
+    update_site false
+  end
+
+  mediawiki_extension "DismissableSiteNotice" do
+    site new_resource.site
+    update_site false
+  end
+
+  mediawiki_extension "Elastica" do
+    site new_resource.site
+    update_site false
+  end
+
+  mediawiki_extension "CirrusSearch" do
+    site new_resource.site
+    template "mw-ext-CirrusSearch.inc.php.erb"
+    update_site false
+  end
+
+  mediawiki_extension "osmtaginfo" do
+    site new_resource.site
+    template "mw-ext-osmtaginfo.inc.php.erb"
+    repository "git://github.com/Firefishy/osmtaginfo.git"
+    tag "live"
+    update_site false
+  end
+
+  mediawiki_extension "SimpleMap" do
+    site new_resource.site
+    template "mw-ext-SimpleMap.inc.php.erb"
+    repository "git://github.com/Firefishy/SimpleMap.git"
+    tag "live"
+    update_site false
+  end
+
+  mediawiki_extension "SlippyMap" do
+    site new_resource.site
+    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.site
+    update_site false
+    action :delete
+  end
+
+  mediawiki_extension "MobileFrontend" do
+    site new_resource.site
+    template "mw-ext-MobileFrontend.inc.php.erb"
+    update_site false
+  end
+
+  mediawiki_extension "DisableAccount" do
+    site new_resource.site
+    template "mw-ext-DisableAccount.inc.php.erb"
+    update_site false
+  end
+
+  mediawiki_extension "VisualEditor" do
+    site new_resource.site
+    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 0o644
+    backup false
+  end
+
+  cookbook_file "#{site_directory}/googled06a989d1ccc8364.html" do
+    cookbook "mediawiki"
+    owner node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+    mode 0o644
+    backup false
+  end
+
+  cookbook_file "#{site_directory}/googlefac54c35e800caab.html" do
+    cookbook "mediawiki"
+    owner node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+    mode 0o644
+    backup false
+  end
+
+  ports = new_resource.ssl_enabled ? [80, 443] : [80]
+
+  ssl_certificate new_resource.site do
+    domains [new_resource.site] + Array(new_resource.aliases)
+    only_if { new_resource.ssl_enabled }
+  end
+
+  apache_site new_resource.site 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
+    reload_apache false
+  end
+
+  # FIXME: needs to run one
+  execute "#{mediawiki_directory}/extensions/CirrusSearch/maintenance/updateSearchIndexConfig.php" do
+    action :nothing
+    command "php extensions/CirrusSearch/maintenance/updateSearchIndexConfig.php"
+    cwd mediawiki_directory
+    user node[:mediawiki][:user]
+    group node[:mediawiki][:group]
+  end
 end
 
-def database_params
-  {
-    :host => "localhost",
-    :name => database_name,
-    :username => database_user,
-    :password => database_password
-  }
+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 0o664
+    variables :name => new_resource.site,
+              :directory => mediawiki_directory,
+              :database_params => database_params,
+              :mediawiki => 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
 
-def mediawiki_params
-  {
-    :sitename => sitename,
-    :metanamespace => metanamespace,
-    :logo => logo,
-    :email_contact => email_contact,
-    :email_sender => email_sender,
-    :email_sender_name => email_sender_name,
-    :commons => commons,
-    :skin => skin,
-    :site_notice => site_notice,
-    :site_readonly => site_readonly,
-    :ssl_enabled => ssl_enabled,
-    :extra_file_extensions => extra_file_extensions,
-    :private_accounts => private_accounts,
-    :private => private
-  }
+action :delete do
+  apache_site new_resource.site do
+    action :delete
+    reload_apache false
+  end
+
+  declare_resource :directory, site_directory do
+    action :delete
+    recursive true
+  end
+
+  mysql_database new_resource.database_name do
+    action :drop
+  end
+
+  mysql_user "#{new_resource.database_user}@localhost" do
+    action :drop
+  end
+end
+
+action_class do
+  def site_directory
+    new_resource.directory || "/srv/#{new_resource.site}"
+  end
+
+  def cron_name
+    new_resource.site.tr(".", "_")
+  end
+
+  def database_params
+    {
+      :host => "localhost",
+      :name => new_resource.database_name,
+      :username => new_resource.database_user,
+      :password => new_resource.database_password
+    }
+  end
+
+  def mediawiki_params
+    {
+      :sitename => new_resource.sitename,
+      :metanamespace => new_resource.metanamespace,
+      :logo => new_resource.logo,
+      :email_contact => new_resource.email_contact,
+      :email_sender => new_resource.email_sender,
+      :email_sender_name => new_resource.email_sender_name,
+      :commons => new_resource.commons,
+      :skin => new_resource.skin,
+      :site_notice => new_resource.site_notice,
+      :site_readonly => new_resource.site_readonly,
+      :ssl_enabled => new_resource.ssl_enabled,
+      :extra_file_extensions => new_resource.extra_file_extensions,
+      :private_accounts => new_resource.private_accounts,
+      :private => new_resource.private
+    }
+  end
+end
+
+def after_created
+  notifies :reload, "service[apache2]" if reload_apache
 end
diff --git a/cookbooks/mediawiki/resources/skin.rb b/cookbooks/mediawiki/resources/skin.rb
index 3aa00ce25..1f897c53b 100644
--- a/cookbooks/mediawiki/resources/skin.rb
+++ b/cookbooks/mediawiki/resources/skin.rb
@@ -17,18 +17,99 @@
 # limitations under the License.
 #
 
-actions :create, :delete
 default_action :create
 
-attribute :name, :kind_of => String, :name_attribute => true
-attribute :site, :kind_of => String, :required => true
-attribute :source, :kind_of => String
-attribute :template, :kind_of => String
-attribute :variables, :kind_of => Hash, :default => {}
-attribute :version, :kind_of => String
-attribute :repository, :kind_of => String
-attribute :revision, :kind_of => String
-attribute :update_site, :kind_of => [TrueClass, FalseClass], :default => true
+property :skin, :kind_of => String, :name_attribute => true
+property :site, :kind_of => String, :required => true
+property :source, :kind_of => String
+property :template, :kind_of => String
+property :variables, :kind_of => Hash, :default => {}
+property :version, :kind_of => String
+property :repository, :kind_of => String
+property :revision, :kind_of => String
+property :update_site, :kind_of => [TrueClass, FalseClass], :default => true
+
+action :create do
+  if new_resource.source
+    remote_directory skin_directory do
+      cookbook "mediawiki"
+      source new_resource.source
+      owner node[:mediawiki][:user]
+      group node[:mediawiki][:group]
+      mode 0o755
+      files_owner node[:mediawiki][:user]
+      files_group node[:mediawiki][:group]
+      files_mode 0o755
+    end
+  else
+    skin_repository = new_resource.repository || default_repository
+    skin_revision = new_resource.revision || "REL#{skin_version}".tr(".", "_")
+
+    git skin_directory do
+      action :sync
+      repository skin_repository
+      revision skin_revision
+      enable_submodules true
+      user node[:mediawiki][:user]
+      group node[:mediawiki][:group]
+      ignore_failure skin_repository.start_with?("git://github.com/wikimedia/mediawiki-skins")
+    end
+  end
+
+  if new_resource.template # ~FC023
+    declare_resource :template, "#{mediawiki_directory}/LocalSettings.d/Skin-#{new_resource.skin}.inc.php" do
+      cookbook "mediawiki"
+      source new_resource.template
+      user node[:mediawiki][:user]
+      group node[:mediawiki][:group]
+      mode 0o664
+      variables new_resource.variables
+    end
+  else
+    skin_script = "#{skin_directory}/#{new_resource.skin}.php"
+
+    file "#{mediawiki_directory}/LocalSettings.d/Skin-#{new_resource.skin}.inc.php" do
+      content "<?php require_once('#{skin_script}');\n"
+      user node[:mediawiki][:user]
+      group node[:mediawiki][:group]
+      mode 0o664
+      only_if { ::File.exist?(skin_script) }
+    end
+  end
+end
+
+action :delete do
+  directory skin_directory do
+    action :delete
+    recursive true
+  end
+
+  file "#{mediawiki_directory}/LocalSettings.d/Skin-#{new_resource.skin}.inc.php" do
+    action :delete
+  end
+end
+
+action_class do
+  def site_directory
+    node[:mediawiki][:sites][new_resource.site][:directory]
+  end
+
+  def mediawiki_directory
+    "#{site_directory}/w"
+  end
+
+  def skin_directory
+    "#{mediawiki_directory}/skins/#{new_resource.skin}"
+  end
+
+  def skin_version
+    new_resource.version || node[:mediawiki][:sites][new_resource.site][:version]
+  end
+
+  def default_repository
+    "git://github.com/wikimedia/mediawiki-skins-#{new_resource.skin}.git"
+  end
+end
 
 def after_created
   if update_site