glenux/vagrant-cachier-ng
glenux/vagrant-cachier-ng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/eaapa/vagrant-cachier into next

Browse source
This commit is contained in:
Fabio Rehm 2014-01-31 22:13:59 -02:00
commit bae14ff303
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -27,6 +27,8 @@ Vagrant.configure("2") do |config|
config.cache.auto_detect = true config.cache.auto_detect = true
# If you are using VirtualBox, you might want to enable NFS for shared folders # If you are using VirtualBox, you might want to enable NFS for shared folders
# config.cache.enable_nfs = true # config.cache.enable_nfs = true
# You can pass extra mount options, for example:
# config.cache.sync_opts = {:create = true}
end end
end end
``` ```

4
lib/vagrant-cachier/config.rb
View file

@ -1,7 +1,7 @@
module VagrantPlugins module VagrantPlugins
module Cachier module Cachier
class Config < Vagrant.plugin(2, :config) class Config < Vagrant.plugin(2, :config)
attr_accessor :scope, :auto_detect, :enable_nfs attr_accessor :scope, :auto_detect, :enable_nfs, :sync_opts
attr_reader :buckets attr_reader :buckets
ALLOWED_SCOPES = %w( box machine ) ALLOWED_SCOPES = %w( box machine )
@ -10,6 +10,7 @@ module VagrantPlugins
@scope = UNSET_VALUE @scope = UNSET_VALUE
@auto_detect = UNSET_VALUE @auto_detect = UNSET_VALUE
@enable_nfs = UNSET_VALUE @enable_nfs = UNSET_VALUE
@sync_opts = UNSET_VALUE
end end
def enable(bucket, opts = {}) def enable(bucket, opts = {})
@ -34,6 +35,7 @@ module VagrantPlugins
@scope = :box if @scope == UNSET_VALUE @scope = :box if @scope == UNSET_VALUE
@auto_detect = false if @auto_detect == UNSET_VALUE @auto_detect = false if @auto_detect == UNSET_VALUE
@enable_nfs = false if @enable_nfs == UNSET_VALUE @enable_nfs = false if @enable_nfs == UNSET_VALUE
@sync_opts = {} if @sync_opts == UNSET_VALUE
@buckets = @buckets ? @buckets.dup : {} @buckets = @buckets ? @buckets.dup : {}
end end

2
lib/vagrant-cachier/provision_ext.rb
View file

@ -18,6 +18,8 @@ module VagrantPlugins
FileUtils.mkdir_p(cache_root.to_s) unless cache_root.exist? FileUtils.mkdir_p(cache_root.to_s) unless cache_root.exist?
synced_folder_opts = {id: "vagrant-cache"} synced_folder_opts = {id: "vagrant-cache"}
synced_folder_opts.merge!(env[:machine].config.cache.sync_opts)
if env[:machine].config.cache.enable_nfs if env[:machine].config.cache.enable_nfs
# REFACTOR: Drop the `nfs: true` argument once we drop support for Vagrant < 1.4 # REFACTOR: Drop the `nfs: true` argument once we drop support for Vagrant < 1.4
synced_folder_opts.merge!({ nfs: true, type: 'nfs' }) synced_folder_opts.merge!({ nfs: true, type: 'nfs' })