1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-03 17:50:11 +02:00

makebuildserver: make chef find the custom cache locations

This commit is contained in:
Hans-Christoph Steiner 2016-01-26 22:06:10 +01:00
parent 7c30569aed
commit b6a5978b11

View File

@ -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' config.vm.provision :shell, :inline => 'sudo echo "Acquire::http {{ Proxy \\"{0}\\"; }};" > /etc/apt/apt.conf.d/02proxy && sudo apt-get update'
""".format(config['aptproxy']) """.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 += """ vagrantfile += """
config.vm.provision :chef_solo do |chef| config.vm.provision :chef_solo do |chef|
chef.cookbooks_path = "cookbooks" chef.cookbooks_path = "cookbooks"