wrapping up 2019.12

[friendica.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index ff38151520a3dc5241d869734344df28f4568d95..f9ffe0c75e260aaa1c6b49559f42ff08226d03c6 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,54 +1,30 @@
 
-server_ip_trusty = "192.168.22.10"
-server_ip_xenial = "192.168.22.11"
-server_memory = "1024" # MB
+server_ip = "192.168.22.10"
+server_memory = "2048" # MB
 server_timezone = "UTC"
 
 public_folder = "/vagrant"
 
 Vagrant.configure(2) do |config|
-######################################################################
-  # Set server to Ubuntu 14.04
-  config.vm.define "trusty" do |trusty|
-    trusty.vm.box = "ubuntu/trusty64"
+  # Set server to Debian 10 / Buster 64bit
+  config.vm.box = "debian/buster64"
 
-    # 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 = true
 
-    # 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 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.local"
 
-    # 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
-
-    # 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"
+  config.vm.synced_folder ".", "/vagrant", id: "vagrant-root", owner: "www-data", group: "www-data"
 
   # Provider-specific configuration so you can fine-tune various
   # backing providers for Vagrant. These expose provider-specific options.
@@ -57,11 +33,11 @@ Vagrant.configure(2) do |config|
   #   vb.gui = true
   #
   #   # Customize the amount of memory on the VM:
-      vb.memory = server_memory
+    vb.memory = server_memory
   end
 
-  # Enable provisioning with a shell script. 
-  config.vm.provision "shell", path: "./util/vagrant_provision.sh"
+  # Enable provisioning with a shell script.
+  config.vm.provision "shell", path: "./bin/dev/vagrant_provision.sh"
     # run: "always"
     # run: "once"
 end