Merge remote-tracking branch 'tigerfell/pr257'

[chef.git] / cookbooks / mediawiki / resources / skin.rb

diff --git a/cookbooks/mediawiki/resources/skin.rb b/cookbooks/mediawiki/resources/skin.rb
index 1f897c53b0d95f0dc0a480cebc25348c8b6842bb..3153fa91a772b37b4e15b682015e782f89f81be6 100644 (file)
--- a/cookbooks/mediawiki/resources/skin.rb
+++ b/cookbooks/mediawiki/resources/skin.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: mediawiki
+# Cookbook:: mediawiki
 # Resource:: mediawiki_skin
 #
-# Copyright 2015, OpenStreetMap Foundation
+# 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
+# https://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,
@@ -17,9 +17,11 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
-property :skin, :kind_of => String, :name_attribute => true
+property :skin, :kind_of => String, :name_property => true
 property :site, :kind_of => String, :required => true
 property :source, :kind_of => String
 property :template, :kind_of => String
@@ -28,6 +30,7 @@ property :version, :kind_of => String
 property :repository, :kind_of => String
 property :revision, :kind_of => String
 property :update_site, :kind_of => [TrueClass, FalseClass], :default => true
+property :legacy, :kind_of => [TrueClass, FalseClass], :default => true
 
 action :create do
   if new_resource.source
@@ -36,10 +39,10 @@ action :create do
       source new_resource.source
       owner node[:mediawiki][:user]
       group node[:mediawiki][:group]
-      mode 0o755
+      mode "755"
       files_owner node[:mediawiki][:user]
       files_group node[:mediawiki][:group]
-      files_mode 0o755
+      files_mode "755"
     end
   else
     skin_repository = new_resource.repository || default_repository
@@ -52,28 +55,34 @@ action :create do
       enable_submodules true
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
-      ignore_failure skin_repository.start_with?("git://github.com/wikimedia/mediawiki-skins")
+      ignore_failure skin_repository.start_with?("https://github.com/wikimedia/mediawiki-skins")
     end
   end
 
-  if new_resource.template # ~FC023
+  if new_resource.template
     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
+      mode "664"
       variables new_resource.variables
     end
   else
-    skin_script = "#{skin_directory}/#{new_resource.skin}.php"
+    if new_resource.legacy
+      file_content = "<?php require_once('#{skin_directory}/#{new_resource.skin}.php');\n"
+      skin_file = "#{skin_directory}/#{new_resource.skin}.php"
+    else
+      file_content = "<?php wfLoadSkin('#{new_resource.skin}');\n"
+      skin_file = "#{skin_directory}/skin.json"
+    end
 
     file "#{mediawiki_directory}/LocalSettings.d/Skin-#{new_resource.skin}.inc.php" do
-      content "<?php require_once('#{skin_script}');\n"
+      content file_content
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
-      mode 0o664
-      only_if { ::File.exist?(skin_script) }
+      mode "664"
+      only_if { ::File.exist?(skin_file) }
     end
   end
 end
@@ -107,7 +116,7 @@ action_class do
   end
 
   def default_repository
-    "git://github.com/wikimedia/mediawiki-skins-#{new_resource.skin}.git"
+    "https://github.com/wikimedia/mediawiki-skins-#{new_resource.skin}.git"
   end
 end