From: Tom Hughes <tom@compton.nu>
Date: Fri, 28 Sep 2018 18:51:26 +0000 (+0100)
Subject: Use sshfs in preference to nfs for vagrant file sharing
X-Git-Tag: live~2815
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c77429000c55af95056572206a99774711c8d22b?hp=b4d1a7ad674c2f4a38e8ce3713e7a95d03cae6e6

Use sshfs in preference to nfs for vagrant file sharing
---

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