Merge pull request #7254 from rmoriz/rmoriz/remote_directory_default

remote_directory: restore overwrite default

2 files changed, 5 insertions, 1 deletions

diff --git a/lib/chef/resource/remote_directory.rb b/lib/chef/resource/remote_directory.rb
index 14e4f4a497..daeb7b35bb 100644
--- a/lib/chef/resource/remote_directory.rb
+++ b/lib/chef/resource/remote_directory.rb
@@ -56,7 +56,7 @@ class Chef
       property :source, String, default: lazy { ::File.basename(path) }
       property :files_backup, [ Integer, FalseClass ], default: 5, desired_state: false
       property :purge, [ TrueClass, FalseClass ], default: false, desired_state: false
-      property :overwrite, [ TrueClass, FalseClass ], default: false
+      property :overwrite, [ TrueClass, FalseClass ], default: true
       property :cookbook, String
 
       def files_group(arg = nil)
diff --git a/spec/unit/resource/remote_directory_spec.rb b/spec/unit/resource/remote_directory_spec.rb
index 8ec2d80bc8..afa16678fc 100644
--- a/spec/unit/resource/remote_directory_spec.rb
+++ b/spec/unit/resource/remote_directory_spec.rb
@@ -67,6 +67,10 @@ describe Chef::Resource::RemoteDirectory do
     expect(resource.files_owner).to eql(1000)
   end
 
+  it "overwrites by default" do
+    expect(resource.overwrite).to be true
+  end
+
   describe "when it has cookbook, files owner, files mode, and source" do
     before do
       resource.path("/var/path/")