Update dnscontrol to 3.0.0

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

diff --git a/cookbooks/mediawiki/resources/skin.rb b/cookbooks/mediawiki/resources/skin.rb
index 63e1627425fb11ffe067fddaf11d1c68ffb391d9..a808273405f9dd254ff0bbcb1cc6eeeaa585389a 100644 (file)
--- a/cookbooks/mediawiki/resources/skin.rb
+++ b/cookbooks/mediawiki/resources/skin.rb
@@ -19,7 +19,7 @@
 
 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


@@ -53,11 +53,11 @@ 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
     declare_resource :template, "#{mediawiki_directory}/LocalSettings.d/Skin-#{new_resource.skin}.inc.php" do
       cookbook "mediawiki"
       source new_resource.template


@@ -114,7 +114,7 @@ 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
 
   end
 end