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

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

diff --git a/cookbooks/wordpress/resources/plugin.rb b/cookbooks/wordpress/resources/plugin.rb
index 778ff6583d98bd5f261dec480a42c29c6e60a471..82c7ae5e2357a1e867d64e788e19ac9bdab65edb 100644 (file)
--- a/cookbooks/wordpress/resources/plugin.rb
+++ b/cookbooks/wordpress/resources/plugin.rb
@@ -17,9 +17,11 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 default_action :create
 

-property :plugin, :kind_of => String, :name_attribute => true
+property :plugin, :kind_of => String, :name_property => true

 property :site, :kind_of => String, :required => true
 property :source, :kind_of => String
 property :version, :kind_of => String
 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]
       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_owner node[:wordpress][:user]
       files_group node[:wordpress][:group]

-      files_mode 0o755
+      files_mode "755"

     end
   else
     plugin_repository = new_resource.repository || default_repository
     end
   else
     plugin_repository = new_resource.repository || default_repository


@@ -47,6 +49,7 @@ action :create do
         action :sync
         repository plugin_repository
         revision new_resource.revision
         action :sync
         repository plugin_repository
         revision new_resource.revision

+        depth 1

         user node[:wordpress][:user]
         group node[:wordpress][:group]
       end
         user node[:wordpress][:user]
         group node[:wordpress][:group]
       end