X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=Vagrantfile;h=3d58ef7a5a31ad1c4795f27d20c02c4ce3735371;hb=83ce42172b4851442f48972e82cb2139465d7ddd;hp=4f1181b8222fd1df6d448585a1af49e2c592e3e9;hpb=c00772204100a44267c38f7a2533268b5dff1248;p=friendica.git

diff --git a/Vagrantfile b/Vagrantfile
index 4f1181b822..3d58ef7a5a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,30 +1,54 @@
 
-server_ip = "192.168.22.10"
-server_memory = "384" # MB
+server_ip_trusty = "192.168.22.10"
+server_ip_xenial = "192.168.22.11"
+server_memory = "1024" # MB
 server_timezone = "UTC"
 
 public_folder = "/vagrant"
 
 Vagrant.configure(2) do |config|
-
+######################################################################
   # Set server to Ubuntu 14.04
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.define "trusty" do |trusty|
+    trusty.vm.box = "ubuntu/trusty64"
+
+    # Disable automatic box update checking. If you disable this, then
+    # boxes will only be checked for updates when the user runs
+    # `vagrant box outdated`. This is not recommended.
+    # config.vm.box_check_update = false
+
+    # Create a hostname, don't forget to put it to the `hosts` file
+    # This will point to the server's default virtual host
+    # TO DO: Make this work with virtualhost along-side xip.io URL
+    trusty.vm.hostname = "friendica-trusty.dev"
+
+    # Create a static IP
+    trusty.vm.network :private_network, ip: server_ip_trusty
+  end
+
+######################################################################
+  # Set server to Ubuntu 16.04
+  config.vm.define "xenial" do |xenial|
+    xenial.vm.box = "boxcutter/ubuntu1604"
 
-  # Disable automatic box update checking. If you disable this, then
-  # boxes will only be checked for updates when the user runs
-  # `vagrant box outdated`. This is not recommended.
-  # config.vm.box_check_update = false
+    # Disable automatic box update checking. If you disable this, then
+    # boxes will only be checked for updates when the user runs
+    # `vagrant box outdated`. This is not recommended.
+    # config.vm.box_check_update = false
 
-  # Create a hostname, don't forget to put it to the `hosts` file
-  # This will point to the server's default virtual host
-  # TO DO: Make this work with virtualhost along-side xip.io URL
-  config.vm.hostname = "friendica.dev"
+    # Create a hostname, don't forget to put it to the `hosts` file
+    # This will point to the server's default virtual host
+    # TO DO: Make this work with virtualhost along-side xip.io URL
+    xenial.vm.hostname = "friendica-xenial.dev"
 
-  # Create a static IP
-  config.vm.network :private_network, ip: server_ip
+    # Create a static IP
+    xenial.vm.network :private_network, ip: server_ip_xenial
+  end
 
+######################################################################
   # Share a folder between host and guest
-  config.vm.synced_folder "./", "/vagrant/", owner: "www-data", group: "vagrant"
+  config.vm.synced_folder ".", "/vagrant", id: "vagrant-root", owner: "www-data", group: "vagrant"
+
 
   # Provider-specific configuration so you can fine-tune various
   # backing providers for Vagrant. These expose provider-specific options.