Merge remote-tracking branch 'github/pull/510'

[chef.git] / cookbooks / wordpress / resources / theme.rb

diff --git a/cookbooks/wordpress/resources/theme.rb b/cookbooks/wordpress/resources/theme.rb
index 18e119b1d7fd31f4e35380c7ac93bd2d1eab90c4..5a402f6d170bf26e0848d7a363477d5c783f1e31 100644 (file)
--- 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
@@ -56,7 +58,7 @@ action :create do
         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 +81,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