X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..b7c12630cb9de017d76fe60ff296534d6d061399:/cookbooks/wordpress/resources/theme.rb?ds=sidebyside diff --git a/cookbooks/wordpress/resources/theme.rb b/cookbooks/wordpress/resources/theme.rb index 331db8316..2c4ceda4e 100644 --- a/cookbooks/wordpress/resources/theme.rb +++ b/cookbooks/wordpress/resources/theme.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: wordpress +# Cookbook:: wordpress # Resource:: wordpress_theme # -# 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. @@ -17,9 +17,11 @@ # limitations under the License. # +unified_mode true + default_action :create -property :theme, :kind_of => String, :name_attribute => true +property :theme, :kind_of => String, :name_property => true property :site, :kind_of => String, :required => true property :source, :kind_of => String property :version, :kind_of => String @@ -34,10 +36,10 @@ action :create do source new_resource.source owner node[:wordpress][:user] group node[:wordpress][:group] - mode 0o755 + mode "755" files_owner node[:wordpress][:user] files_group node[:wordpress][:group] - files_mode 0o644 + files_mode "644" end else theme_repository = new_resource.repository || default_repository @@ -50,6 +52,22 @@ action :create do user node[:wordpress][:user] group node[:wordpress][:group] end + elsif theme_repository.end_with?(".zip") + zip_path = "#{Chef::Config[:file_cache_path]}/#{new_resource.theme}.zip" + + remote_file zip_path do + source theme_repository + action :create + end + + archive_file zip_path do + destination theme_directory + action :nothing + overwrite true + group node[:wordpress][:group] + owner node[:wordpress][:user] + subscribes :extract, "remote_file[#{zip_path}]", :immediately + end else subversion theme_directory do action :sync