X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c984db017eb409e5b8a445c8f8935254c276c6b5..226773e8e4b1b7e0141c45e0040fa2cd4141282a:/cookbooks/mediawiki/resources/skin.rb?ds=sidebyside diff --git a/cookbooks/mediawiki/resources/skin.rb b/cookbooks/mediawiki/resources/skin.rb index 3aa00ce25..15ab63946 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, @@ -17,26 +17,109 @@ # limitations under the License. # -actions :create, :delete +unified_mode true + default_action :create -attribute :name, :kind_of => String, :name_attribute => true -attribute :site, :kind_of => String, :required => true -attribute :source, :kind_of => String -attribute :template, :kind_of => String -attribute :variables, :kind_of => Hash, :default => {} -attribute :version, :kind_of => String -attribute :repository, :kind_of => String -attribute :revision, :kind_of => String -attribute :update_site, :kind_of => [TrueClass, FalseClass], :default => 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 :variables, :kind_of => Hash, :default => {} +property :version, :kind_of => String +property :repository, :kind_of => String +property :revision, :kind_of => String +property :update_site, :kind_of => [TrueClass, FalseClass], :default => true +property :legacy, :kind_of => [TrueClass, FalseClass], :default => true -def after_created - if update_site - notifies :update, "mediawiki_site[#{site}]" +action :create do + if new_resource.source + remote_directory skin_directory do + cookbook "mediawiki" + source new_resource.source + owner node[:mediawiki][:user] + group node[:mediawiki][:group] + mode "755" + files_owner node[:mediawiki][:user] + files_group node[:mediawiki][:group] + files_mode "755" + end else - site_directory = node[:mediawiki][:sites][site][:directory] + skin_repository = new_resource.repository || default_repository + skin_revision = new_resource.revision || "REL#{skin_version}".tr(".", "_") - notifies :create, "template[#{site_directory}/w/LocalSettings.php]" - notifies :run, "execute[#{site_directory}/w/maintenance/update.php]" + git skin_directory do + action :sync + repository skin_repository + revision skin_revision + enable_submodules true + user node[:mediawiki][:user] + group node[:mediawiki][:group] + ignore_failure skin_repository.start_with?("https://github.com/wikimedia/mediawiki-skins") + end end + + 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 "664" + variables new_resource.variables + end + else + if new_resource.legacy + file_content = "