From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 26 Jan 2016 21:06:10 +0000 (+0100)
Subject: makebuildserver: make chef find the custom cache locations
X-Git-Tag: 0.6.0~17^2~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b6a5978b11856a46599708e0c2cfe12ef1861f87;p=fdroidserver.git

makebuildserver: make chef find the custom cache locations
---

diff --git a/makebuildserver b/makebuildserver
index aeb5ebbc..77c6063c 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -367,6 +367,13 @@ if 'aptproxy' in config and config['aptproxy']:
   config.vm.provision :shell, :inline => 'sudo echo "Acquire::http {{ Proxy \\"{0}\\"; }};" > /etc/apt/apt.conf.d/02proxy && sudo apt-get update'
 """.format(config['aptproxy'])
 
+# buildserver/ is shared to the VM's /vagrant by default so the old default
+# does not need a custom mount
+if cachedir != 'buildserver/cache':
+    vagrantfile += """
+  config.vm.synced_folder '{0}', '/vagrant/cache'
+""".format(cachedir)
+
 vagrantfile += """
   config.vm.provision :chef_solo do |chef|
     chef.cookbooks_path = "cookbooks"