X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/45dde9418dd342bb1a632d82559201c0b3becf1a..b8327dbd4ad1f06acf2d42bf056ef1cbfe83c27f:/cookbooks/mediawiki/resources/skin.rb?ds=sidebyside diff --git a/cookbooks/mediawiki/resources/skin.rb b/cookbooks/mediawiki/resources/skin.rb index 63e162742..f70ad6afe 100644 --- a/cookbooks/mediawiki/resources/skin.rb +++ b/cookbooks/mediawiki/resources/skin.rb @@ -19,7 +19,7 @@ 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 @@ -37,10 +37,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 @@ -53,17 +53,17 @@ 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 @@ -79,7 +79,7 @@ action :create do content file_content user node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0o664 + mode "664" only_if { ::File.exist?(skin_file) } end end @@ -114,7 +114,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