From c77429000c55af95056572206a99774711c8d22b Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 28 Sep 2018 19:51:26 +0100 Subject: [PATCH 1/1] Use sshfs in preference to nfs for vagrant file sharing --- Vagrantfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index b6248d66c..fcb4790fe 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -11,16 +11,19 @@ Vagrant.configure("2") do |config| 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" - override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => "nfs" + override.vm.synced_folder ".", "/srv/openstreetmap-website", :type => sharing_type 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" - 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 -- 2.43.2