lib/bib/bib_vagrant.rb in bib-vagrant-0.1.4 vs lib/bib/bib_vagrant.rb in bib-vagrant-0.1.5
- old
+ new
@@ -75,11 +75,12 @@
{
'landrush' => 'https://github.com/phinze/landrush',
'vagrant-hosts' => 'https://github.com/adrienthebo/vagrant-hosts',
'vagrant-faster' => 'https://github.com/rdsubhas/vagrant-faster#how-much-does-it-allocate',
'vagrant-cachier' => 'https://github.com/easybib/issues/wiki/Knowledgebase:-Global-Vagrant-setup#enable-vagrant-cachier-globally',
- 'bib-vagrant' => 'See https://github.com/easybiblabs/bib-vagrant/blob/master/README.md'
+ 'bib-vagrant' => 'See https://github.com/easybiblabs/bib-vagrant/blob/master/README.md',
+ 'vagrant-logs' => 'See https://github.com/easybiblabs/vagrant-logs/blob/master/README.md'
}
end
def init_github_hostkey(machine)
machine.vm.provision 'shell' do |s|
@@ -123,14 +124,14 @@
exit
end
dna
end
- def prepare_app_settings(vagrantconfig, machine, dna, applicationlist = 'applications')
+ def prepare_app_settings(vagrantconfig, machine, dna, host_folder_root, applicationlist = 'applications')
dna = add_composertoken_to_dna(dna, vagrantconfig)
dna['vagrant'][applicationlist].each do |app, app_config|
vagrant_share = File.expand_path(app_config['app_root_location'])
- host_folder = "#{File.dirname(__FILE__)}/sites/#{app}"
+ host_folder = host_folder_root + "/#{app}"
if vagrantconfig['nfs']
machine.vm.synced_folder host_folder, vagrant_share, type: 'nfs', mount_options: ['nolock,vers=3,udp,noatime,actimeo=1']
elsif vagrantconfig['rsync']
machine.vm.synced_folder host_folder, vagrant_share, type: 'rsync'
else