Skip to content

Commit

Permalink
Remove String interpolation from mount options. Remove the `join(',')…
Browse files Browse the repository at this point in the history
…` too. The `options` declaration supports both Array and Strings. Update README accordingly.
  • Loading branch information
Russell Brooks committed Oct 29, 2014
1 parent 5d7b692 commit 5c14cf8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ See `attributes/default.rb` for default vaules.
* `node['backup']['log_path']` - Where backup logs will be stored. Defaults is `/var/log`
* `node['backup']['addl_flags']` - Additional flags to pass on to the backup executable, such as `--tmp-path`
* `node['backup']['model_path']` - Where backup models (definitions) are stored. Default is `node['backup']['config_path']/models`
* `node['backup']['mount_options']` String or Array of [mount options](https://docs.getchef.com/resource_mount.html#attributes). (example: `["rw", "nfsvers=3"]` would become the comma-delimited string, `rw,nfsvers=3`, passed to the `-o` argument of the `mount` command and inserted into the `<options>` column of `/etc/fstab`).
* `node['backup']['dependencies']` - An array of arrays of additional dependencies and optional versions needed for backups. The backup gem will inform you about these when the backup runs. (examples: `['fog']`, `[['fog', '1.4.0'], ['s3']]`)
* `node['backup']['user']` - User that performs backups. Default is root
* `node['backup']['group']` - Group that performs backups. Default is root
Expand Down
2 changes: 1 addition & 1 deletion providers/mount.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def whyrun_supported?
mount new_resource.path do
fstype 'nfs'
device device_name
options "#{node['backup']['mount_options'].join(',')}"
options node['backup']['mount_options']
action [:mount, :enable]
end
end
Expand Down

0 comments on commit 5c14cf8

Please sign in to comment.