Skip to content

Commit

Permalink
Merge branch 'master' into nc/wf-log-bug
Browse files Browse the repository at this point in the history
  • Loading branch information
ncerny authored Apr 14, 2017
2 parents e762974 + 4560c48 commit 710fdbb
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion resources/file.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
default_action :create

property :filename, String, name_property: true
property :source, String, required: true
property :source, String
property :user, String, default: 'root'
property :group, String, default: 'root'
property :mode, String, default: '0600'
Expand All @@ -31,6 +31,7 @@
end

action :create do
new_resource.source = (property_is_set?(:source) ? new_resource.source : "cookbook_file://#{new_resource.filename}")
if new_resource.source.start_with?('cookbook_file://')
src = new_resource.source.split('://')[1].split('::')

Expand Down

0 comments on commit 710fdbb

Please sign in to comment.