Merge remote-tracking branch 'github/pull/561'

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

diff --git a/cookbooks/mediawiki/resources/skin.rb b/cookbooks/mediawiki/resources/skin.rb
index 9b13248955950431b3fc9fe49c6680603c460f0d..15ab639464f815380fe87e69be06e4e848d4bfea 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
 #
 # 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
 #
 #
 # 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,
 #
 # 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.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 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
 property :site, :kind_of => String, :required => true
 property :source, :kind_of => String
 property :template, :kind_of => String


@@ -37,10 +39,10 @@ action :create do
       source new_resource.source
       owner node[:mediawiki][:user]
       group node[:mediawiki][:group]
       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_owner node[:mediawiki][:user]
       files_group node[:mediawiki][:group]

-      files_mode 0o755
+      files_mode "755"

     end
   else
     skin_repository = new_resource.repository || default_repository
     end
   else
     skin_repository = new_resource.repository || default_repository


@@ -53,17 +55,17 @@ action :create do
       enable_submodules true
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       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
 
     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]
     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
       variables new_resource.variables
     end
   else


@@ -79,7 +81,7 @@ action :create do
       content file_content
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       content file_content
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]

-      mode 0o664
+      mode "664"

       only_if { ::File.exist?(skin_file) }
     end
   end
       only_if { ::File.exist?(skin_file) }
     end
   end


@@ -114,17 +116,10 @@ action_class do
   end
 
   def default_repository
   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
 
 def after_created
   end
 end
 
 def after_created

-  if update_site
-    notifies :update, "mediawiki_site[#{site}]"
-  else
-    site_directory = node[:mediawiki][:sites][site][:directory]
-
-    notifies :create, "template[#{site_directory}/w/LocalSettings.php]"
-    notifies :run, "execute[#{site_directory}/w/maintenance/update.php]"
-  end
+  notifies :update, "mediawiki_site[#{site}]" if update_site

 end
 end