X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1934f47340e1cdd2ffb814c1d9b77d28a3fa621a..e92ed5e09215d67f2bd7dc21a32425d7ec5aa26f:/cookbooks/wordpress/resources/theme.rb

diff --git a/cookbooks/wordpress/resources/theme.rb b/cookbooks/wordpress/resources/theme.rb
index 18e119b1d..2c4ceda4e 100644
--- a/cookbooks/wordpress/resources/theme.rb
+++ b/cookbooks/wordpress/resources/theme.rb
@@ -1,14 +1,14 @@
 #
-# 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.
 # 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,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,13 +52,29 @@ 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
         repository theme_repository
         user node[:wordpress][:user]
         group node[:wordpress][:group]
-        ignore_failure theme_repository.start_with?("http://themes.svn.wordpress.org/")
+        ignore_failure theme_repository.start_with?("https://themes.svn.wordpress.org/")
       end
     end
   end
@@ -79,7 +97,7 @@ action_class do
   end
 
   def default_repository
-    "http://themes.svn.wordpress.org/#{new_resource.theme}/#{new_resource.version}"
+    "https://themes.svn.wordpress.org/#{new_resource.theme}/#{new_resource.version}"
   end
 end