projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b4d1a7a
)
Use sshfs in preference to nfs for vagrant file sharing
author
Tom Hughes
<tom@compton.nu>
Fri, 28 Sep 2018 18:51:26 +0000
(19:51 +0100)
committer
Tom Hughes
<tom@compton.nu>
Fri, 28 Sep 2018 18:56:23 +0000
(19:56 +0100)
Vagrantfile
patch
|
blob
|
history
diff --git
a/Vagrantfile
b/Vagrantfile
index b6248d66c379c197c354de271ef54694b72b8d11..fcb4790fef74461c0f028afc5c1a6d8032426522 100644
(file)
--- a/
Vagrantfile
+++ b/
Vagrantfile
@@
-11,16
+11,19
@@
Vagrant.configure("2") do |config|
vb.customize ["modifyvm", :id, "--uartmode1", "disconnected"]
end
vb.customize ["modifyvm", :id, "--uartmode1", "disconnected"]
end
- # use third party image and NFS sharing for lxc
+ # Use sshfs sharing if available, otherwise NFS sharing
+ sharing_type = Vagrant.has_plugin?("vagrant-sshfs") ? "sshfs" : "nfs"
+
+ # use third party image and sshfs or NFS sharing for lxc
config.vm.provider "lxc" do |_, override|
override.vm.box = "generic/ubuntu1804"
config.vm.provider "lxc" do |_, override|
override.vm.box = "generic/ubuntu1804"
- override.vm.synced_folder ".", "/srv/openstreetmap-website", :type =>
"nfs"
+ override.vm.synced_folder ".", "/srv/openstreetmap-website", :type =>
sharing_type
end
end
- # use third party image and NFS sharing for libvirt
+ # use third party image and
sshfs or
NFS sharing for libvirt
config.vm.provider "libvirt" do |_, override|
override.vm.box = "generic/ubuntu1804"
config.vm.provider "libvirt" do |_, override|
override.vm.box = "generic/ubuntu1804"
- override.vm.synced_folder ".", "/srv/openstreetmap-website", :type =>
"nfs"
+ override.vm.synced_folder ".", "/srv/openstreetmap-website", :type =>
sharing_type
end
# configure shared package cache if possible
end
# configure shared package cache if possible