Update piwik to 4.3.1

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

diff --git a/cookbooks/mediawiki/resources/skin.rb b/cookbooks/mediawiki/resources/skin.rb
index e9ac651453a80fe83126805261df521b1d9db710..3153fa91a772b37b4e15b682015e782f89f81be6 100644 (file)
--- a/cookbooks/mediawiki/resources/skin.rb
+++ b/cookbooks/mediawiki/resources/skin.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 property :skin, :kind_of => String, :name_property => true
 default_action :create
 
 property :skin, :kind_of => String, :name_property => true


@@ -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,7 +55,7 @@ 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
 


@@ -63,7 +65,7 @@ action :create do
       source new_resource.template
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       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,7 +116,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