X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/3b7baca46c8d80ab08712ea5bf35c68c1f23d09a..96d2a331a1a585d2ed4bc2d70f5626e03c38dbb2:/Vagrantfile diff --git a/Vagrantfile b/Vagrantfile index 15d66e9e..5c9563bd 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -17,44 +17,36 @@ Vagrant.configure("2") do |config| config.vm.define "ubuntu", primary: true do |sub| sub.vm.box = "bento/ubuntu-16.04" sub.vm.provision :shell do |s| - s.path = "vagrant/install-on-ubuntu-16.sh" + s.path = "vagrant/Install-on-Ubuntu-16.sh" s.privileged = false s.args = [checkout] end end - config.vm.define "centos" do |sub| - sub.vm.box = "bento/centos-7.2" + config.vm.define "travis" do |sub| + sub.vm.box = "bento/ubuntu-14.04" sub.vm.provision :shell do |s| - s.path = "vagrant/install-on-centos-7.sh" + s.path = "vagrant/install-on-travis-ci.sh" s.privileged = false s.args = [checkout] end end - # configure shared package cache if possible - #if Vagrant.has_plugin?("vagrant-cachier") - # config.cache.enable :apt - # config.cache.scope = :box - #end - + config.vm.define "centos" do |sub| + sub.vm.box = "centos/7" + sub.vm.provision :shell do |s| + s.path = "vagrant/Install-on-Centos-7.sh" + s.privileged = false + s.args = "yes" + end + sub.vm.synced_folder ".", "/home/vagrant/Nominatim", disabled: true + sub.vm.synced_folder ".", "/vagrant", disabled: true + end config.vm.provider "virtualbox" do |vb| vb.gui = false - vb.customize ["modifyvm", :id, "--memory", "2048"] + vb.memory = 2048 + vb.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate//vagrant","0"] end - - # config.vm.provider :digital_ocean do |provider, override| - # override.ssh.private_key_path = '~/.ssh/id_rsa' - # override.vm.box = 'digital_ocean' - # override.vm.box_url = "https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box" - - # provider.token = '' - # # provider.token = 'YOUR TOKEN' - # provider.image = 'ubuntu-14-04-x64' - # provider.region = 'nyc2' - # provider.size = '512mb' - # end - end