only block bulks with ignored redirect

[nominatim.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index 042148f7f239dccbee92179ec2955ea5e553e188..5c9563bd0ef0ced397584b24eb94bd6efa9ded25 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,48 +2,51 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|

-
-  # Ubuntu LTS 14.04
-  config.vm.box = "ubuntu/trusty64" 
-

   # Apache webserver
   # Apache webserver

-  config.vm.network "forwarded_port", guest: 8089, host: 8089
-
+  config.vm.network "forwarded_port", guest: 80, host: 8089

 
   # If true, then any SSH connections made will enable agent forwarding.
   config.ssh.forward_agent = true
 
 
   # If true, then any SSH connections made will enable agent forwarding.
   config.ssh.forward_agent = true
 

-  config.vm.synced_folder ".", "/home/vagrant/Nominatim"
-
-
-
-  # provision using a simple shell script
-  config.vm.provision :shell, :path => "vagrant-provision.sh"
+  checkout = "yes"
+  if ENV['CHECKOUT'] != 'y' then
+      config.vm.synced_folder ".", "/home/vagrant/Nominatim"
+      checkout = "no"
+  end

 
 

+  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.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
+  config.vm.define "travis" do |sub|
+      sub.vm.box = "bento/ubuntu-14.04"
+      sub.vm.provision :shell do |s|
+        s.path = "vagrant/install-on-travis-ci.sh"
+        s.privileged = false
+        s.args = [checkout]
+      end

   end
 
   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
 
   config.vm.provider "virtualbox" do |vb|
     vb.gui = false

-    vb.customize ["modifyvm", :id, "--memory", "1024"]
-  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 = 'e74c5c15501bd2782e689b0805ad577f954bfd39ea1fde3f17ff62835f2fc6c1'
-    # provider.token = 'YOUR TOKEN'
-    provider.image = 'ubuntu-14-04-x64'
-    provider.region = 'nyc2'
-    provider.size = '512mb'
+    vb.memory = 2048
+    vb.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate//vagrant","0"]

   end
 
 end
   end
 
 end