X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/647c3003e35fe19d949e1d78c4bb6f2c526e6bad..f5c209a2991b26130dcae5cfcc613be001f5106d:/cookbooks/mediawiki/resources/skin.rb diff --git a/cookbooks/mediawiki/resources/skin.rb b/cookbooks/mediawiki/resources/skin.rb index 9b1324895..a80827340 100644 --- 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, @@ -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 @@ -53,11 +53,11 @@ 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 @@ -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