From c984db017eb409e5b8a445c8f8935254c276c6b5 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 1 Apr 2015 08:50:52 +0100
Subject: [PATCH 1/1] Fix skin for OSMF wiki

---
 cookbooks/foundation/recipes/wiki.rb  | 30 ++++++---------------------
 cookbooks/mediawiki/providers/skin.rb |  8 ++-----
 cookbooks/mediawiki/resources/skin.rb |  2 +-
 3 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index 4f5914a1d..925d2602d 100644
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -40,32 +40,14 @@ mediawiki_site "wiki.osmfoundation.org" do
   recaptcha_private_key passwords["wiki"]["recaptcha"]
 end
 
-cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do
-  owner node[:mediawiki][:user]
-  group node[:mediawiki][:group]
-  mode 0644
+mediawiki_skin "osmf" do
+  site "wiki.osmfoundation.org"
+  repository "git://github.com/tomhughes/mediawiki-skins-osmf.git"
+  revision "master"
 end
 
-subversion "/srv/wiki.osmfoundation.org/w/skins/osmf-skin" do
-  repository "http://svn.openstreetmap.org/extensions/mediawiki/osmf"
-  user node[:mediawiki][:user]
-  group node[:mediawiki][:group]
-end
-
-link "/srv/wiki.osmfoundation.org/w/skins/osmf" do
-  to "osmf-skin/osmf"
-  owner node[:mediawiki][:user]
-  group node[:mediawiki][:group]
-end
-
-link "/srv/wiki.osmfoundation.org/w/skins/osmf.deps.php" do
-  to "osmf-skin/osmf.deps.php"
-  owner node[:mediawiki][:user]
-  group node[:mediawiki][:group]
-end
-
-link "/srv/wiki.osmfoundation.org/w/skins/osmf.php" do
-  to "osmf-skin/osmf.php"
+cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
+  mode 0644
 end
diff --git a/cookbooks/mediawiki/providers/skin.rb b/cookbooks/mediawiki/providers/skin.rb
index 2ee0504c7..bacd49804 100644
--- a/cookbooks/mediawiki/providers/skin.rb
+++ b/cookbooks/mediawiki/providers/skin.rb
@@ -37,16 +37,12 @@ action :create do
     end
   else
     skin_repository = new_resource.repository || default_repository
-    skin_reference = if new_resource.tag
-                       "refs/tags/#{new_resource.tag}"
-                     else
-                       "REL#{skin_version}".tr(".", "_")
-                     end
+    skin_revision = new_resource.revision || "REL#{skin_version}".tr(".", "_")
 
     git skin_directory do
       action :sync
       repository skin_repository
-      reference skin_reference
+      revision skin_revision
       enable_submodules true
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
diff --git a/cookbooks/mediawiki/resources/skin.rb b/cookbooks/mediawiki/resources/skin.rb
index 42622a473..3aa00ce25 100644
--- a/cookbooks/mediawiki/resources/skin.rb
+++ b/cookbooks/mediawiki/resources/skin.rb
@@ -27,7 +27,7 @@ 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 :revision, :kind_of => String
 attribute :update_site, :kind_of => [TrueClass, FalseClass], :default => true
 
 def after_created
-- 
2.43.2